Fit to new model classes