Added waveform class