Add support for enums