Improved network functionality