Adds pagination in some calls