Better handling the enum values.