Add pagination to system