added Enum special handling