Add support for paging, plucking