Futrher improvements to the networking module