Ran out of time adding vault compatibility