Don't track native and av from CM - yet