Improved upgrade from legacy storage