[REFACTOR] Storage object