[TASK] adjust to updated Routing