refs #Task8266 refactoring model
Merge pull request #38 from MuiNV54/task8266

refs #Task8266 refactoring model