fix data model
Merge pull request #8 from edmoz/fix-data-model

fix data model