Adding matcher integration