added support for enums