Added category EnumSet to ComponentChoice