Only export the needed functions
Refactor paging