Improve routing definition