Added some changes that were lost in the branch merging step.
Add the db table changes in the full schema