Defining new models
Merge branch 'newdb' into stage