include pagniation and refactor to simple CRUD