Fix to adapt Persist being renamed to Storage