attempt to change some mappings to lazy fetch