Fix SoT Integration