Added lazy loading for references