Changed Enum format