Use Lazy loading instead of Eager to reduce database calls

Use Lazy loading instead of Eager to reduce database calls #3759