Added Entities, Nav. properties, and mapping