General architecture tasks > Rethink routing