Upgrade to v1beta2