Minor refactoring of Model creation

Andrey Veltischev requested to merge alex/minor-refactoring into master

Merge request reports