Added support for enum values in expressions