Back to native way of state->storage interplay
Fix description