Updated member methods to reflect match class changes.