Adding a bit more wiring of different interfaces and queues