Added server and tcp connection