Upgrade to v1beta2

Also pull the clientid from the hash