Storage reformatting from v6.x to v7.x