Improved CMS autorouting