Refactoring of Torm::Model