Refactoring paging and configurations