Added new enum values based on new sets