Refactoring of ModelInstance. AH-140