Rewrite VaultHandler