Updates to routing