Adapted to latest SSVS/SSES/SSVCS