Modified struct of models.
Merge pull request #2 from shonenada/feature/model-fix

Modified struct of models.