Add support for Enum types