Merge ThreadConnect and Server