Adding support for Enum