Fixed lazy loading properties