Update domain model
Merge pull request #11 from jasondbaker/dev-jdb-04172014

Update domain model