Part 1 of Adding storage option