Fixed types and sample JSON to be v1beta1 compatible