Added more network functionality