refactored storage key