Refactor SMTCExtension