Adapted to latest SSVS and SSES