More eager loading for more efficient queries