More match notification work