Converted enums to widely accepted values