Changes for ENUM types

Changes for ENUM types