Enum support added