added vault support