Refactored OpenSolutionModel