Model refactor issue #715