Update routing system to make it more future-flexible