Add pagination and loading