Improve network ops