Updated new Routing Module