Adjust the computeSCC API and core