Generalize SCM support