Switch to better routing with paths