Updated data model
Fixed conflicts
Redifined data model
Merge pull request #8 from jank0s/master

Redifined data model