Refactor Storage Manager [NOT READY]