RaceHandler moved to core