[#493] Pagination support