Added storage manager