Adding support for enumerations