Refactored Storage Service.