Organizing Class 04 with generic modulator