Updated to follow guidelines from latest module pipeline

With coming change to remove temporary static route mapping. :smile: