Add pagination feature and refactored