Add wavenumber property
Add rewrite expression methods [skip ci]