Feature: storage (2)