Further updates for new db upgrade system