Adding some network handling