Add pagination and specs