Added extendable routing