Added more network stuff