Extract wrapper types
Add beta waveforms