Refactoring of Virtuoso model creation.