Start adding support for API service, and pagination