Added ClientCom and ServerCom