Added storage to facilitate bootstrapping.