Added support for enum types