UdpServer refactoring