diff --git a/arch/oc-components.puml b/arch/oc-components.puml
index c9bd7a9..5194b43 100644
--- a/arch/oc-components.puml
+++ b/arch/oc-components.puml
@@ -8,12 +8,15 @@ component auth as "oc-auth"
 component cat as "oc-catalog"
 component workspace as "oc-workspace"
 component workflow as "oc-workflow"
-component shed as "oc-scheduler"
+component shed as "oc-schedulerd"
 component disco as "oc-discovery"
 component agg as "oc-aggregator"
-component stat as "oc-status"
-component timetable as "oc-timetable"
+component stat as "oc-statusd"
+component timetable as "oc-scheduler"
 component monitor as "oc-monitor"
+component peers as "oc-peers"
+component dc as "oc-datacenter"
+component monitor as "oc-monitord"
 
 cloud net as "Internet"
 
@@ -28,22 +31,29 @@ api -- workspace : store user data
 api -- workflow 
 api -- disco
 api -- agg : distributed search 
-api -- stat
 api -- timetable : get user or datacenter workflows execution plan
+api -- peers
+api--dc
 
-
-workflow -- shed : schedule workflow
+timetable -- shed : schedule workflow
 
 mongo -- cat
+mongo -- workspace
+mongo -- workflow
+mongo -- dc
+mongo -- timetable
+mongo -- peers
+mongo -- shed
+
 
 disco -- zn : front adisco rank peers on keywords
 disco -- rd : store discovered peers for monitoring
 stat -- net : check peer health
 stat -- rd : store peer health adisco connectivity stats
-cat -- disco : front for known peers
+peers -- disco : check for known peers
+peers--stat : check peer health
 agg -- net : front remote catalogs
 agg -- zn : front adisco rank results
-shed -- cat
 shed -- monitor : deploy and monitor workflow 
 
 net -- disco : crawl IPFS for peers
diff --git a/wbs/wbs.puml b/wbs/wbs.puml
index a61ef4b..f0d2a1f 100644
--- a/wbs/wbs.puml
+++ b/wbs/wbs.puml
@@ -1,15 +1,15 @@
 @startmindmap
 * OC for DTF
 ** colors
-***[#yellow] sprint 1 in progress
-***[#lightyellow] (OK) sprint 1 task finished
-*** planned to be developped, might be (OK) if schedule allows
+***[#yellow] iteration 1 in progress
+***[#lightyellow] (OK) iteration 1 task finished
+*** planned to be developped, might be (OK) if schedule allows it
 ***[#lightblue] not in DTF scope yet
-***[#orange] sprint 2
+***[#orange] iteration 2
 ***[#lightgreen] Thales proposed scopes
 ** OC-Catalog
 ***[#orange] authentication => RBAC
-*** algo metadata ingress, res min max)
+***[#orange] algo metadata ingress, res min max)
 *** (OK) new resource type : workflow
 ***[#lightyellow] (OK) split catalog - workspace - workflow
 ***[#lightblue] algo metadata input output description
@@ -20,7 +20,7 @@
 ***[#lightyellow] (OK) automatically starting workflows
 *** (OK) monitoring workflows
 ***[#orange] workflow to service generation (deployment yaml)
-*** (OK) workflow to other targets (slurm)
+*** workflow to other targets (slurm)
 ** OC-Search => Front
 ***[#lightblue] algo input/output description
 ***[#lightblue] algo input/output rules check