Add `wave_type` attribute to Streamers
Slight refactoring