diff --git a/index.js b/index.js
index d2c2ec6..d542a17 100644
--- a/index.js
+++ b/index.js
@@ -12,12 +12,11 @@ const outputUtils = require('./src/helper/outputUtils.js');
 const logger = require('./src/helper/logger.js');
 const validation = require('./src/helper/validationUtils.js');
 const configUtils = require('./src/helper/configUtils.js');
-const assertions = require('./src/helper/assertionUtils.js')
 
 // Domain-specific modules
 const { MeasurementContainer } = require('./src/measurements/index.js');
 const configManager = require('./src/configs/index.js');
-const nrmse = require('./src/nrmse/errorMetrics.js');
+const nrmse = require('./src/nrmse/ErrorMetrics.js');
 const state = require('./src/state/state.js');
 const convert = require('./src/convert/index.js');
 const MenuManager = require('./src/menu/index.js');
@@ -35,7 +34,6 @@ module.exports = {
     configUtils,
     logger,
     validation,
-    assertions,
     MeasurementContainer,
     nrmse,
     state,
diff --git a/src/configs/measurement.json b/src/configs/measurement.json
index 9b32f80..c061ae9 100644
--- a/src/configs/measurement.json
+++ b/src/configs/measurement.json
@@ -1,7 +1,7 @@
 {
     "general": {
         "name": {
-            "default": "Measurement Configuration",
+            "default": "Sensor",
             "rules": {
                 "type": "string",
                 "description": "A human-readable name or label for this measurement configuration."
diff --git a/src/helper/childRegistrationUtils.js b/src/helper/childRegistrationUtils.js
index cd816b1..ea083ec 100644
--- a/src/helper/childRegistrationUtils.js
+++ b/src/helper/childRegistrationUtils.js
@@ -8,7 +8,7 @@ class ChildRegistrationUtils {
   async registerChild(child, positionVsParent) {
     const { softwareType } = child.config.functionality;
     const { name, id } = child.config.general;
-    
+
     this.logger.debug(`Registering child: ${name} (${id}) as ${softwareType} at ${positionVsParent}`);
 
     // Enhanced child setup
@@ -33,9 +33,9 @@ class ChildRegistrationUtils {
       registeredAt: Date.now()
     });
 
-    // IMPORTANT: Only call parent registration - no automatic handling
-    if (typeof this.mainClass.registerOnChildEvents === 'function') {
-      this.mainClass.registerOnChildEvents();
+    // IMPORTANT: Only call parent registration - no automatic handling and if parent has this function then try to register this child
+    if (typeof this.mainClass.registerChild === 'function') {
+      this.mainClass.registerChild(child, softwareType);
     }
 
     this.logger.info(`✅ Child ${name} registered successfully`);
diff --git a/src/measurements/MeasurementContainer.js b/src/measurements/MeasurementContainer.js
index 1479d9f..20099f8 100644
--- a/src/measurements/MeasurementContainer.js
+++ b/src/measurements/MeasurementContainer.js
@@ -148,6 +148,7 @@ class MeasurementContainer {
 
       // Emit the exact event your parent expects
       this.emitter.emit(`${this._currentType}.${this._currentVariant}.${this._currentPosition}`, eventData);
+      //console.log(`Emitted event: ${this._currentType}.${this._currentVariant}.${this._currentPosition}`, eventData);
 
       return this;
   }