Model refactoring
Model refactoring
Merge branch 'master' of https://github.com/DigiArea/jse-model