Refactored Storage Service