Add pagination and Validations