Added support for Enum values