Added structure for matching analysis.