Include match id in output