added a bit of eager loading
added a bit of eager loading