Added lazy loading for hasOne relationships