Make use of adaptive router by Romain (WIP)