Removed Skip Pagination and made relevant changes