More changes to the API, update vault classes to the v2 api.