Adding missing support for enums