EnumColumn and TitledEnumLabel improvement