Added WaveManager