Refactored storage service