Corresponding changes to wrt Routing DI changes. Refer pr#63

Refer PR #63 in routing