Updated data model
Merge pull request #5 from 42rockers/better-model-coverage

Updated data model