Add ability to change storage