added eager loading (avoid running a lot of queries)