addeds some cm stuff

Change-Id: I36d3f5737005f35a45d68be27742425254f2af76