Database changes

Changes to the DB setup