added support for enum types