Added Beam support for matches.