Switch on Enum losing enumeration names

Look like it was not implemented, i +1 to do so :slight_smile: