Improved data model
Improved data model.
Merge pull request #11 from mdijkstra/master

Improved data model