Moving the component models into the page model