Refactor Storage Service