Support output
Handle Or and add match macro