Integrate storage-modal logic in redesign