diff --git a/AlgebraicDataflowArchitectureModel/models/CustomerOffice.model b/AlgebraicDataflowArchitectureModel/models/CustomerOffice.model
index f140bff..c587fb7 100644
--- a/AlgebraicDataflowArchitectureModel/models/CustomerOffice.model
+++ b/AlgebraicDataflowArchitectureModel/models/CustomerOffice.model
@@ -1,33 +1,13 @@
-channel C_CustomerAOff_In {
-	out customerA_off(c:String, setOff(x)) == x
-	out customerA_off(c, e) == c
+channel CIO_SetCustomerOff(uid:Str) {
+	out customers.{uid}.off(cid:Str, setOff(cid2)) == cid2
 }
 
-channel C_CustomerBOff_In {
-	out customerB_off(c:String, setOff(x)) == x
-	out customerB_off(c, e) == c
+channel CIO_SetCompanyAdd(cid:Str) {
+	out companies.{cid}.add(a1:Str, setAdd(a2)) == a2
 }
 
-channel C_CompanyC1Add_In {
-	out companyC1_add(a:String, setAdd(y)) == y
-	out companyC1_add(a, e) == a
-}
-
-channel C_CompanyC2Add_In {
-	out companyC2_add(a:String, setAdd(y)) == y
-	out companyC2_add(a, e) == a
-}
-
-channel CA {
-	in customerA_off(c, sync(z, u, v)) == z
-	in companyC1_add(a1, sync(z, u, v)) == u
-	in companyC2_add(a2, sync(z, u, v)) == v
-	out customerA_add(a3:String, sync(z, u, v)) == if(eq(z, C1), u, if(eq(z, C2), v, null))
-}
-
-channel CB {
-	in customerB_off(c, sync(z, u, v)) == z
-	in companyC1_add(a1, sync(z, u, v)) == u
-	in companyC2_add(a2, sync(z, u, v)) == v
-	out customerB_add(a3:String, sync(z, u, v)) == if(eq(z, C1), u, if(eq(z, C2), v, null))
+channel C(uid:Str) {
+	in customers.{uid}.off(cid, sync(cid2, a2)) == cid2
+	in companies.{cid2}.add(a1, sync(cid2, a2)) == a2
+	out customers.{uid}.add(a3:Str, sync(cid2, a2)) == a2
 }