Added new routing format, backwards compatible