Major refactorings for modelsolutions