Preparing for storage change