Improved Pagination Support
Code refactoring