Update controller

 - Refined network handler