Use new waveform data library