Updating files to match vault version of V7 V2