Added Waves, Avulsion, and Plume components.