Add pagination to master