Add eager-loading in several places to improve performance