Additional changes to upgrade process