Add CMD and Connect listeners