Add CM_DEVICE identifier 2