Added foundation for new routing system.