Added proper networking