Added ordering and pagination features