Redefined Db structure and All The Models
Fixed merge conflict