Added more network infrastructure