refs #Task8266 refactoring model