Add Enum Support to EntityMap