Add wave format to control and flow.