Added new models
Merged
Changed default db and added new fields to model
merged