Adding storage module
merge