Updates to re-align the database scripts with the latest database version