Final changes to db migrate