Eager-loading take 2