Added the storage manager