Prep work to allow more storage state.