Finish implementing vault prefix/suffix support.