Updated vault support to a different class.