Added parameter to disable skipping of waves
Added EventWaveSkip