Bring model back from Zeprj project.
Refactoring code.