[MF] Add model fitting back to solution