Improved routing features