Add routing and TOF