Improved network setup