Add support for cmhw