refactor classification_scheme fields