Adding waveform class