Use new SCM interface