Changed name of storage to storageManager to fit in with naming conventions.