Upgraded to v1beta2