Added infrastructure for generating toy waveforms