Added functiality for token routing