Add paging and fix component models