Make Net_Service smarter