Lots of network architecture improvents