Changed the routing structure