Improve auto eager loading