Changes for new installation of wspgrade