Refactoring, correcting vault support loading