Add Wavefront handler to diamond