Added support for eager_load