Adding track propagation to matching classes