Moved the wave/match event triggering into the replication class