- [ ] restructure the calling of CE meassures (use flags) & more flexible than CIRCOMOD implementation - [ ] define with CML what CE measures to quantify - [ ] implement CE measures (create sub-issues) - [ ] also for newly added sectors relevant!