Refactored storage (test fail)