Re-add vault support functions
Go support