Scm refactor