Adapted to latest SSVStart