Rivals in NFS Heat

Hello! I hope the rivals system from Payback returns like do a number of races, then you race with a rival themselves. I bet there are more than 4 rivals like in Payback.