Add Pagination and error handling support