Add Enum support to EntityMap