Bug fixes
Add comment for eager loading