add cm support