Completed optimalization of eager loading