Redesign complex enums