Pagination and some updates