Add OC and simple gov into msm2