Added Waves class