add expanded class diagram showing some ideas for Match- and RawView (draw.io)