Completed the storage manager