Added Wave class