Updated entities mapping to enable lazy loading