added non-eager loading of associations