Introduce EntityType and EntityIdentifier