Add support for match opponent.