Added creation of entity-entity maps