Let's try to refactor this + fix br-tun detection
Improve DHCP path + refactoring