Further updates to new db upgrade system
Final new files for new db upgrade system