Update to routing mechanism