Add RawShow class and instances
Tidy export list