Make enhancements eager_load! friendly