Zeroconf support restructurization