Moved create_waveform back to broker