improved storage manager