RestPaginator improvement [WIP]