Add some eager preloading to optimize on SQL queries