Modified model and updated db
Merged conflicts