Cleaned up and modified the model

Find inserts under resources.
data model commit
Merge branch 'master' into working-branch