Use eager loading instead of n+1 queries

Signed-off-by: Evan Tedesco <evantedesco@gmail.com>