Added support for enums