Scc refactoring