Added different wave types