Added pagination to save API calls