Updated routing mechanism.