Refactored collection pagination