Change routing logic