Changing models to lazy loading for 1.5