Improve upgrade process