Changes to support different routings