Add the new structure
Add pagination