Refactored pagination controller and collections