Add support for doubles matches