Added some eager loading to avoid N+1 queries!