Updated for per page limits and pagination