Improvements TCPServer