knx.ts 1.0.2 → 1.0.4

package/dist/core/EMI.js

@@ -5,15 +5,11 @@ const KNXHelper_1 = require("../utils/KNXHelper");
 const EnumControlFieldExtended_1 = require("./enum/EnumControlFieldExtended");
 const ControlField_1 = require("./ControlField");
 const MessageCodeField_1 = require("./MessageCodeField");
-const APCI_1 = require("./layers/interfaces/APCI");
-const APCIEnum_1 = require("./enum/APCIEnum");
 const checksumFrame_1 = require("../utils/checksumFrame");
 const SystemStatus_1 = require("./SystemStatus");
-class InvalidInputObject extends Error {
-    constructor(className) {
-        super(`The input object in the ${className} is must be an object with specific properties`);
-    }
-}
+const APCIEnum_1 = require("./enum/APCIEnum");
+const APCI_1 = require("./layers/interfaces/APCI");
+const NPDU_1 = require("./layers/data/NPDU");
 /**
  * @alias External_Message_Interface
  * @description The External Message Interface (EMI) is a standardized interface for communication between external devices and KNX systems. It allows for the integration of various external systems, such as building management systems, into the KNX network.
@@ -39,7 +35,6 @@ class EMI {
         let serviceName;
         // Priorizamos EMI2/IMI2, luego CEMI
         for (const [key, val] of Object.entries(MessageCodeField_1.MESSAGE_CODE_FIELD)) {
-            // @ts-ignore
             const codes = val;
             if (codes["EMI2/IMI2"] && codes["EMI2/IMI2"].value === messageCode) {
                 serviceName = key;
@@ -63,7 +58,6 @@ class EMI {
             EMI.ApplicationLayerEMI,
         ];
         for (const group of groups) {
-            // @ts-ignore
             const ServiceClass = group[serviceName];
             if (ServiceClass && typeof ServiceClass.fromBuffer === "function") {
                 return ServiceClass.fromBuffer(buffer);
@@ -76,127 +70,127 @@ class EMI {
      */
     static LayerAccess = {
         "PEI_Switch.req": class PEISwitchReq {
-            constructor(value) {
-                this.systemStatus = value.systemStatus;
-                this.LL = value.LL;
-                this.NL = value.NL;
-                this.TLG = value.TLG;
-                this.TLC = value.TLC;
-                this.TLL = value.TLL;
-                this.AL = value.AL;
-                this.MAN = value.MAN;
-                this.PEI = value.PEI;
-                this.USR = value.USR;
-                this.res = value.res;
+            constructor(systemStatus, LL, NL, TLG, TLC, TLL, AL, MAN, PEI, USR, res) {
+                this.systemStatus = systemStatus;
+                this.LL = LL;
+                this.NL = NL;
+                this.TLG = TLG;
+                this.TLC = TLC;
+                this.TLL = TLL;
+                this.AL = AL;
+                this.MAN = MAN;
+                this.PEI = PEI;
+                this.USR = USR;
+                this.res = res;
             }
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["PEI_Switch.req"]["EMI2/IMI2"].value;
             systemStatus;
-            #LL = 0;
-            #NL = 0;
-            #TLG = 0;
-            #TLC = 0;
-            #TLL = 0;
-            #AL = 0;
-            #MAN = 0;
-            #PEI = 0;
-            #USR = 0;
-            #res = 0;
+            _LL = 0;
+            _NL = 0;
+            _TLG = 0;
+            _TLC = 0;
+            _TLL = 0;
+            _AL = 0;
+            _MAN = 0;
+            _PEI = 0;
+            _USR = 0;
+            _res = 0;
             set LL(value) {
                 if (value < 0 || value > 7)
                     throw new TypeError("The property 'LL' must be 4 bits");
-                this.#LL = value;
+                this._LL = value;
             }
             get LL() {
-                return this.#LL;
+                return this._LL;
             }
             set NL(value) {
                 if (value < 0 || value > 7)
                     throw new TypeError("The property 'NL' must be 4 bits");
-                this.#NL = value;
+                this._NL = value;
             }
             get NL() {
-                return this.#NL;
+                return this._NL;
             }
             set TLG(value) {
                 if (value < 0 || value > 7)
                     throw new TypeError("The property 'TLG' must be 4 bits");
-                this.#TLG = value;
+                this._TLG = value;
             }
             get TLG() {
-                return this.#TLG;
+                return this._TLG;
             }
             set TLC(value) {
                 if (value < 0 || value > 7)
                     throw new TypeError("The property 'TLC' must be 4 bits");
-                this.#TLC = value;
+                this._TLC = value;
             }
             get TLC() {
-                return this.#TLC;
+                return this._TLC;
             }
             set TLL(value) {
                 if (value < 0 || value > 7)
                     throw new TypeError("The property 'TLL' must be 4 bits");
-                this.#TLL = value;
+                this._TLL = value;
             }
             get TLL() {
-                return this.#TLL;
+                return this._TLL;
             }
             set AL(value) {
                 if (value < 0 || value > 7)
                     throw new TypeError("The property 'AL' must be 4 bits");
-                this.#AL = value;
+                this._AL = value;
             }
             get AL() {
-                return this.#AL;
+                return this._AL;
             }
             set MAN(value) {
                 if (value < 0 || value > 7)
                     throw new TypeError("The property 'MAN' must be 4 bits");
-                this.#MAN = value;
+                this._MAN = value;
             }
             get MAN() {
-                return this.#MAN;
+                return this._MAN;
             }
             set PEI(value) {
                 if (value < 0 || value > 7)
                     throw new TypeError("The property 'PEI' must be 4 bits");
-                this.#PEI = value;
+                this._PEI = value;
             }
             get PEI() {
-                return this.#PEI;
+                return this._PEI;
             }
             set USR(value) {
                 if (value < 0 || value > 7)
                     throw new TypeError("The property 'USR' must be 4 bits");
-                this.#USR = value;
+                this._USR = value;
             }
             get USR() {
-                return this.#USR;
+                return this._USR;
             }
             set res(value) {
                 if (value < 0 || value > 7)
                     throw new TypeError("The property 'res' must be 4 bits");
-                this.#res = value;
+                this._res = value;
             }
             get res() {
-                return this.#res;
+                return this._res;
             }
             toBuffer() {
                 let octet3 = 0;
-                octet3 = octet3 | (this.#LL << 4);
-                octet3 = octet3 | this.#NL;
+                octet3 = octet3 | (this._LL << 4);
+                octet3 = octet3 | this._NL;
                 let octet4 = 0;
-                octet4 = octet4 | (this.#TLG << 4);
-                octet4 = octet4 | this.#TLC;
+                octet4 = octet4 | (this._TLG << 4);
+                octet4 = octet4 | this._TLC;
                 let octet5 = 0;
-                octet5 = octet5 | (this.#TLL << 4);
-                octet5 = octet5 | this.#AL;
+                octet5 = octet5 | (this._TLL << 4);
+                octet5 = octet5 | this._AL;
                 let octet6 = 0;
-                octet6 = octet6 | (this.#MAN << 4);
-                octet6 = octet6 | this.#PEI;
+                octet6 = octet6 | (this._MAN << 4);
+                octet6 = octet6 | this._PEI;
                 let octet7 = 0;
-                octet7 = octet7 | (this.#USR << 4);
-                octet7 = octet7 | this.#res;
+                octet7 = octet7 | (this._USR << 4);
+                octet7 = octet7 | this._res;
                 const buffer = Buffer.alloc(7);
                 buffer.writeUInt8(this.messageCode, 0);
                 buffer.writeUInt8(this.systemStatus.value, 1);
@@ -210,16 +204,16 @@ class EMI {
             describe() {
                 return {
                     systemStatus: `${this.systemStatus.describe()}`,
-                    LL: this.#LL.toString(),
-                    NL: this.#NL.toString(),
-                    TLG: this.#TLG.toString(),
-                    TLC: this.#TLC.toString(),
-                    TLL: this.#TLL.toString(),
-                    AL: this.#AL.toString(),
-                    MAN: this.#MAN.toString(),
-                    PEI: this.#PEI.toString(),
-                    USR: this.#USR.toString(),
-                    res: this.#res.toString(),
+                    LL: this._LL.toString(),
+                    NL: this._NL.toString(),
+                    TLG: this._TLG.toString(),
+                    TLC: this._TLC.toString(),
+                    TLL: this._TLL.toString(),
+                    AL: this._AL.toString(),
+                    MAN: this._MAN.toString(),
+                    PEI: this._PEI.toString(),
+                    USR: this._USR.toString(),
+                    res: this._res.toString(),
                 };
             }
         },
@@ -232,19 +226,16 @@ class EMI {
      */
     static BusmonitorEMI = {
         "L_Busmon.ind": class LBusmonInd {
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("L_Busmon.ind must be an object with specific properties.");
-                }
-                // Initialize properties based on the value provided
-                this.status = value.status;
-                this.timeStamp = value.timeStamp;
-                this.controlField1 = value.controlField1;
-                this.LPDU = value.LPDU;
+            constructor(status, timeStamp, controlField1, LPDU) {
+                // Initialize properties based on the values provided
+                this.status = status;
+                this.timeStamp = timeStamp;
+                this.controlField1 = controlField1;
+                this.LPDU = LPDU;
             }
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_Busmon.ind"]["EMI2/IMI2"].value;
             status;
-            #timeStamp = 0;
+            _timeStamp = 0;
             controlField1;
             /**
              * Data Link Protocol Data Unit (LPDU) - This is the actual data payload of the message.
@@ -254,13 +245,13 @@ class EMI {
              */
             LPDU;
             get timeStamp() {
-                return this.#timeStamp;
+                return this._timeStamp;
             }
             set timeStamp(value) {
                 if (typeof value !== "number" || value < 0 || value > 65535) {
                     throw new Error("timeStamp must be a number between 0 and 65535.");
                 }
-                this.#timeStamp = value;
+                this._timeStamp = value;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(5 + this.LPDU.length + 1); // bit 5 + lpdu + Checksum
@@ -316,12 +307,7 @@ class EMI {
                 const controlField1 = new ControlField_1.ControlField(controlFieldByte);
                 // LPDU (resto del buffer)
                 const LPDU = buffer.subarray(5);
-                return new LBusmonInd({
-                    status,
-                    timeStamp,
-                    controlField1,
-                    LPDU,
-                });
+                return new LBusmonInd(status, timeStamp, controlField1, LPDU);
             }
         },
         /**
@@ -332,12 +318,9 @@ class EMI {
          * running system counter of the sending device equals the value given in “time”.
          */
         "L_Plain_Data.req": class LPlainDataReq {
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("L_Plain_Data.req must be an object with specific properties.");
-                }
-                this.time = value.time;
-                this.data = value.data;
+            constructor(time, data) {
+                this.time = time;
+                this.data = data;
             }
             time; // Time delay before sending the message
             data; // Data to be sent
@@ -385,10 +368,7 @@ class EMI {
                 if (data.length > 28) {
                     throw new Error(`Data too long for L_Plain_Data.req: ${data.length} bytes (max 28)`);
                 }
-                return new LPlainDataReq({
-                    time,
-                    data,
-                });
+                return new LPlainDataReq(time, data);
             }
         },
     };
@@ -398,42 +378,36 @@ class EMI {
      */
     static DataLinkLayerEMI = {
         "L_Data.req": class LDataReq {
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("L_Data.req must be an object with specific properties.");
-                }
+            addressType;
+            npci;
+            constructor(priority, ackRequest, destinationAddress, addressType, npci, npdu) {
+                this.addressType = addressType;
+                this.npci = npci;
                 this.controlField1 = new ControlField_1.ControlField(0);
-                this.controlField1.priority = value.control.priority;
-                this.controlField1.ackRequest = value.control.ackRequest;
-                if (KNXHelper_1.KNXHelper.isValidGroupAddress(value.destinationAddress) ||
-                    KNXHelper_1.KNXHelper.isValidIndividualAddress(value.destinationAddress)) {
-                    this.destinationAddress = value.destinationAddress;
+                this.controlField1.priority = priority;
+                this.controlField1.ackRequest = ackRequest;
+                if (KNXHelper_1.KNXHelper.isValidGroupAddress(destinationAddress) ||
+                    KNXHelper_1.KNXHelper.isValidIndividualAddress(destinationAddress)) {
+                    this.destinationAddress = destinationAddress;
                 }
                 else {
                     throw new Error("The Destination Address is invalid Group Address or Individual Address");
                 }
-                this.addressType = value.addressType;
-                this.NPCI = value.NPCI;
-                this.npdu = value.NPDU;
+                this.addressType = addressType;
+                this.npci = npci;
+                this.npdu = npdu;
             }
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_Data.req"]["EMI2/IMI2"].value;
             controlField1; // Control field 1
             destinationAddress; // Destination address
-            addressType;
-            NPCI;
-            octNumber = 0;
             npdu; // Network Protocol Data Unit (NPDU)
             toBuffer() {
-                const buffer = Buffer.alloc(7 + this.npdu.length);
+                const npduBuffer = this.npdu.toBuffer();
+                const buffer = Buffer.alloc(6 + npduBuffer.length);
                 buffer.writeUInt8(this.messageCode, 0);
-                this.controlField1.buffer.copy(buffer, 1); // Assuming controlField1 is a Buffer
+                this.controlField1.buffer.copy(buffer, 1);
                 KNXHelper_1.KNXHelper.GetAddress_(this.destinationAddress).copy(buffer, 4);
-                buffer[6] =
-                    0x00 |
-                        ((this.addressType << 7) |
-                            (this.NPCI << 4) |
-                            (this.npdu.length & 0x0f));
-                this.npdu.copy(buffer, 7);
+                npduBuffer.copy(buffer, 6);
                 return buffer;
             }
             describe() {
@@ -441,10 +415,7 @@ class EMI {
                     messageCode: `Código de mensaje: ${this.messageCode}`,
                     controlField1: `Campo de control 1: ${this.controlField1.describe()}`,
                     destinationAddress: `Dirección de destino: ${this.destinationAddress}`,
-                    addressType: `AT: ${EnumControlFieldExtended_1.AddressType[this.addressType]}`,
-                    npci: `NPCI: ${this.NPCI}`,
-                    npdu: `NPDU: ${this.npdu.toString("hex")}`,
-                    octNumber: this.npdu.length.toString(),
+                    npdu: this.npdu.describe(),
                     rawValue: `Valor numérico: ${this.toBuffer().toString("hex")}`,
                 };
             }
@@ -458,45 +429,31 @@ class EMI {
                 }
                 const controlFieldByte = buffer.readUInt8(1);
                 const controlField1 = new ControlField_1.ControlField(controlFieldByte);
-                //[cite_start]// Bytes 2 and 3 are unused in Req [cite: 273]
                 const destinationAddressBuf = buffer.subarray(4, 6);
-                // Nota: Asumimos dirección de grupo por defecto si no podemos distinguir, pero el AT nos dirá
                 const octet6 = buffer.readUInt8(6);
                 const addressType = (octet6 >> 7) & 0x01;
-                const NPCI = (octet6 >> 4) & 0x07;
-                const length = octet6 & 0x0f;
+                const NPCI_val = (octet6 >> 4) & 0x07;
+                // const length = octet6 & 0x0f;
                 const destinationAddress = KNXHelper_1.KNXHelper.GetAddress(destinationAddressBuf, addressType === EnumControlFieldExtended_1.AddressType.GROUP ? "/" : ".");
-                const npdu = buffer.subarray(7, 7 + length);
-                return new LDataReq({
-                    control: {
-                        priority: controlField1.priority,
-                        ackRequest: controlField1.ackRequest,
-                    },
-                    destinationAddress: destinationAddress,
-                    addressType: addressType,
-                    NPCI: NPCI,
-                    NPDU: npdu,
-                });
+                const npdu = NPDU_1.NPDU.fromBuffer(buffer.subarray(6));
+                return new LDataReq(controlField1.priority, controlField1.ackRequest, destinationAddress, addressType, NPCI_val, npdu);
             }
         },
         "L_Data.con": class LDataCon {
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("L_Data.req must be an object with specific properties.");
-                }
+            constructor(priority, confirm, destinationAddress, addressType, npci, npdu) {
                 this.controlField1 = new ControlField_1.ControlField(0);
-                this.controlField1.priority = value.control.priority;
-                this.controlField1.confirm = value.control.confirm;
-                if (KNXHelper_1.KNXHelper.isValidGroupAddress(value.destinationAddress) ||
-                    KNXHelper_1.KNXHelper.isValidIndividualAddress(value.destinationAddress)) {
-                    this.destinationAddress = value.destinationAddress;
+                this.controlField1.priority = priority;
+                this.controlField1.confirm = confirm;
+                if (KNXHelper_1.KNXHelper.isValidGroupAddress(destinationAddress) ||
+                    KNXHelper_1.KNXHelper.isValidIndividualAddress(destinationAddress)) {
+                    this.destinationAddress = destinationAddress;
                 }
                 else {
                     throw new Error("The Destination Address is invalid Group Address or Individual Address");
                 }
-                this.addressType = value.addressType;
-                this.NPCI = value.NPCI;
-                this.npdu = value.NPDU;
+                this.addressType = addressType;
+                this.NPCI = npci;
+                this.npdu = npdu;
             }
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_Data.con"]["EMI2/IMI2"].value;
             controlField1; // Control field 1
@@ -510,11 +467,7 @@ class EMI {
                 buffer.writeUInt8(this.messageCode, 0);
                 this.controlField1.buffer.copy(buffer, 1); // Assuming controlField1 is a Buffer
                 KNXHelper_1.KNXHelper.GetAddress_(this.destinationAddress).copy(buffer, 4);
-                buffer[6] =
-                    0x00 |
-                        ((this.addressType << 7) |
-                            (this.NPCI << 4) |
-                            (this.npdu.length & 0x0f));
+                buffer[6] = 0x00 | ((this.addressType << 7) | (this.NPCI << 4) | (this.npdu.length & 0x0f));
                 this.npdu.copy(buffer, 7);
                 return buffer;
             }
@@ -542,42 +495,29 @@ class EMI {
                 const controlField1 = new ControlField_1.ControlField(controlFieldByte);
                 const octet6 = buffer.readUInt8(6);
                 const addressType = (octet6 >> 7) & 0x01;
-                const NPCI = (octet6 >> 4) & 0x07;
+                const NPCI_val = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
-                //[cite_start]// Bytes 2 and 3 unused [cite: 282]
                 const destinationAddressBuf = buffer.subarray(4, 6);
                 const destinationAddress = KNXHelper_1.KNXHelper.GetAddress(destinationAddressBuf, addressType === EnumControlFieldExtended_1.AddressType.GROUP ? "/" : ".");
                 const npdu = buffer.subarray(7, 7 + length);
-                return new LDataCon({
-                    control: {
-                        priority: controlField1.priority,
-                        confirm: controlField1.confirm,
-                    },
-                    destinationAddress: destinationAddress,
-                    addressType: addressType,
-                    NPCI: NPCI,
-                    NPDU: npdu,
-                });
+                return new LDataCon(controlField1.priority, controlField1.confirm, destinationAddress, addressType, NPCI_val, npdu);
             }
         },
         "L_Data.ind": class LDataInd {
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("L_Data.ind must be an object with specific properties.");
-                }
+            constructor(priority, sourceAddress, destinationAddress, addressType, npci, npdu) {
                 this.controlField1 = new ControlField_1.ControlField(0);
-                this.controlField1.priority = value.control.priority;
-                if (KNXHelper_1.KNXHelper.isValidGroupAddress(value.destinationAddress) ||
-                    KNXHelper_1.KNXHelper.isValidIndividualAddress(value.destinationAddress)) {
-                    this.destinationAddress = value.destinationAddress;
+                this.controlField1.priority = priority;
+                if (KNXHelper_1.KNXHelper.isValidGroupAddress(destinationAddress) ||
+                    KNXHelper_1.KNXHelper.isValidIndividualAddress(destinationAddress)) {
+                    this.destinationAddress = destinationAddress;
                 }
                 else {
                     throw new Error("The Destination Address is invalid Group Address or Individual Address");
                 }
-                this.sourceAddress = value.sourceAddress;
-                this.addressType = value.addressType;
-                this.NPCI = value.NPCI;
-                this.npdu = value.NPDU;
+                this.sourceAddress = sourceAddress;
+                this.addressType = addressType;
+                this.NPCI = npci;
+                this.npdu = npdu;
             }
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_Data.ind"]["EMI2/IMI2"].value;
             controlField1; // Control field 1
@@ -593,11 +533,7 @@ class EMI {
                 this.controlField1.buffer.copy(buffer, 1); // Assuming controlField1 is a Buffer
                 KNXHelper_1.KNXHelper.GetAddress_(this.sourceAddress).copy(buffer, 2);
                 KNXHelper_1.KNXHelper.GetAddress_(this.destinationAddress).copy(buffer, 4);
-                buffer[6] =
-                    0x00 |
-                        ((this.addressType << 7) |
-                            (this.NPCI << 4) |
-                            (this.npdu.length & 0x0f));
+                buffer[6] = 0x00 | ((this.addressType << 7) | (this.NPCI << 4) | (this.npdu.length & 0x0f));
                 this.npdu.copy(buffer, 7);
                 return buffer;
             }
@@ -628,58 +564,48 @@ class EMI {
                 const sourceAddress = KNXHelper_1.KNXHelper.GetAddress(sourceAddressBuf, ".");
                 const octet6 = buffer.readUInt8(6);
                 const addressType = (octet6 >> 7) & 0x01;
-                const NPCI = (octet6 >> 4) & 0x07;
+                const NPCI_val = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const destinationAddressBuf = buffer.subarray(4, 6);
                 const destinationAddress = KNXHelper_1.KNXHelper.GetAddress(destinationAddressBuf, addressType === EnumControlFieldExtended_1.AddressType.GROUP ? "/" : ".");
                 const npdu = buffer.subarray(7, 7 + length);
-                return new LDataInd({
-                    control: {
-                        priority: controlField1.priority,
-                    },
-                    sourceAddress: sourceAddress,
-                    destinationAddress: destinationAddress,
-                    addressType: addressType,
-                    NPCI: NPCI,
-                    NPDU: npdu,
-                });
+                return new LDataInd(controlField1.priority, sourceAddress, destinationAddress, addressType, NPCI_val, npdu);
             }
         },
         "L_Poll_Data.req": class LPollDataReq {
-            constructor(value) {
-                this.#pollingGroup = value.pollingGroup;
-                this.#nrOfSlots = value.nrOfSlots;
+            constructor(pollingGroup, nrOfSlots) {
+                this.pollingGroup = pollingGroup;
+                this.nrOfSlots = nrOfSlots;
             }
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_Poll_Data.req"]["EMI2/IMI2"].value;
             control = 0xf0;
-            #pollingGroup = 0;
-            #nrOfSlots = 0;
+            _pollingGroup = 0;
+            _nrOfSlots = 0;
             set pollingGroup(value) {
-                if (value < 0 || value > 65.535)
+                if (value < 0 || value > 65535)
                     throw new Error("The value must be 16 bits");
-                this.#pollingGroup = value;
+                this._pollingGroup = value;
             }
             get pollingGroup() {
-                return this.#pollingGroup;
+                return this._pollingGroup;
             }
             set nrOfSlots(value) {
                 if (value < 0 || value > 7)
                     throw new Error("The value must be 4 bits");
-                this.#nrOfSlots = value;
+                this._nrOfSlots = value;
             }
             get nrOfSlots() {
-                return this.#nrOfSlots;
+                return this._nrOfSlots;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(7);
                 let octet7 = 0;
-                octet7 = octet7 | (this.#nrOfSlots & 0x0f);
+                octet7 = octet7 | (this._nrOfSlots & 0x0f);
                 buffer.writeUInt8(this.messageCode, 0);
                 buffer.writeUInt8(this.control, 1);
                 buffer.writeUInt8(0, 2);
                 buffer.writeUInt8(0, 3);
-                buffer.writeUInt8(this.#pollingGroup & 0xff00, 4);
-                buffer.writeUInt8(this.#pollingGroup & 0x00ff, 5);
+                buffer.writeUInt16BE(this._pollingGroup, 4);
                 buffer.writeUInt8(octet7, 6);
                 return buffer;
             }
@@ -687,8 +613,8 @@ class EMI {
                 return {
                     messageCode: `Codigo de mensaje: ${this.messageCode}`,
                     control: `Control: ${this.control}`,
-                    pollingGroup: `${this.#pollingGroup}`,
-                    nrOfGroup: `${this.#nrOfSlots}`,
+                    pollingGroup: `${this._pollingGroup}`,
+                    nrOfGroup: `${this._nrOfSlots}`,
                 };
             }
             static fromBuffer(buffer) {
@@ -701,47 +627,43 @@ class EMI {
                 }
                 const pollingGroup = buffer.readUInt16BE(4);
                 const nrOfSlots = (buffer.readUInt8(6) & 0x0f);
-                return new LPollDataReq({
-                    pollingGroup,
-                    nrOfSlots,
-                });
+                return new LPollDataReq(pollingGroup, nrOfSlots);
             }
         },
         "L_Poll_Data.con": class LPollDataCon {
-            constructor(value) {
-                this.#pollingGroup = value.pollingGroup;
-                this.#nrOfSlots = value.nrOfSlots;
-                this.control.confirm = value.control.confirm;
+            constructor(pollingGroup, nrOfSlots, confirm) {
+                this.pollingGroup = pollingGroup;
+                this.nrOfSlots = nrOfSlots;
+                this.control.confirm = confirm;
             }
             control = new ControlField_1.ControlField(0xf0);
-            #pollingGroup = 0;
-            #nrOfSlots = 0;
+            _pollingGroup = 0;
+            _nrOfSlots = 0;
             set pollingGroup(value) {
-                if (value < 0 || value > 65.535)
+                if (value < 0 || value > 65535)
                     throw new Error("The value must be 16 bits");
-                this.#pollingGroup = value;
+                this._pollingGroup = value;
             }
             get pollingGroup() {
-                return this.#pollingGroup;
+                return this._pollingGroup;
             }
             set nrOfSlots(value) {
                 if (value < 0 || value > 7)
                     throw new Error("The value must be 4 bits");
-                this.#nrOfSlots = value;
+                this._nrOfSlots = value;
             }
             get nrOfSlots() {
-                return this.#nrOfSlots;
+                return this._nrOfSlots;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(7);
                 let octet7 = 0;
-                octet7 = octet7 | (this.#nrOfSlots & 0x0f);
+                octet7 = octet7 | (this._nrOfSlots & 0x0f);
                 buffer.writeUInt8(MessageCodeField_1.MESSAGE_CODE_FIELD["L_Poll_Data.con"]["EMI2/IMI2"].value, 0);
                 this.control.buffer.copy(buffer, 1);
                 buffer.writeUInt8(0, 2);
                 buffer.writeUInt8(0, 3);
-                buffer.writeUInt8(this.#pollingGroup & 0xff00, 4);
-                buffer.writeUInt8(this.#pollingGroup & 0x00ff, 5);
+                buffer.writeUInt16BE(this._pollingGroup, 4);
                 buffer.writeUInt8(octet7, 6);
                 return buffer;
             }
@@ -749,8 +671,8 @@ class EMI {
                 return {
                     messageCode: `Codigo de mensaje: ${MessageCodeField_1.MESSAGE_CODE_FIELD["L_Poll_Data.con"]["EMI2/IMI2"].value}`,
                     control: `Control: ${this.control}`,
-                    pollingGroup: `${this.#pollingGroup}`,
-                    nrOfGroup: `${this.#nrOfSlots}`,
+                    pollingGroup: `${this._pollingGroup}`,
+                    nrOfGroup: `${this._nrOfSlots}`,
                 };
             }
             static fromBuffer(buffer) {
@@ -758,38 +680,29 @@ class EMI {
                 if (buffer.readUInt8(0) !== messageCode) {
                     throw new Error(`Invalid message code for L_Poll_Data.con. Expected ${messageCode}, got ${buffer.readUInt8(0)}`);
                 }
-                const controlByte = buffer.readInt8(1);
+                const controlField = new ControlField_1.ControlField(buffer.readUInt8(1));
                 const pollingGroup = buffer.readUInt16BE(4);
                 const nrOfSlots = (buffer.readUInt8(6) & 0x0f);
-                return new LPollDataCon({
-                    pollingGroup,
-                    nrOfSlots,
-                    control: {
-                        confirm: controlByte << 7 === 1 ? true : false,
-                    },
-                });
+                return new LPollDataCon(pollingGroup, nrOfSlots, controlField.confirm);
             }
         },
         "L_SystemBroadcast.req": class LSystemBroadcastReq {
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("L_Data.ind must be an object with specific properties.");
-                }
+            constructor(priority, confirm, ackRequest, destinationAddress, addressType, npci, npdu) {
                 this.controlField1 = new ControlField_1.ControlField(0b10000000);
-                this.controlField1.priority = value.control.priority;
-                this.controlField1.confirm = value.control.confirm;
-                this.messageCode =
-                    MessageCodeField_1.MESSAGE_CODE_FIELD["L_SystemBroadcast.req"]["EMI2/IMI2"].value;
-                if (KNXHelper_1.KNXHelper.isValidGroupAddress(value.destinationAddress) ||
-                    KNXHelper_1.KNXHelper.isValidIndividualAddress(value.destinationAddress)) {
-                    this.destinationAddress = value.destinationAddress;
+                this.controlField1.priority = priority;
+                this.controlField1.confirm = confirm;
+                this.controlField1.ackRequest = ackRequest;
+                this.messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_SystemBroadcast.req"]["EMI2/IMI2"].value;
+                if (KNXHelper_1.KNXHelper.isValidGroupAddress(destinationAddress) ||
+                    KNXHelper_1.KNXHelper.isValidIndividualAddress(destinationAddress)) {
+                    this.destinationAddress = destinationAddress;
                 }
                 else {
                     throw new Error("The Destination Address is invalid Group Address or Individual Address");
                 }
-                this.addressType = value.addressType;
-                this.NPCI = value.NPCI;
-                this.npdu = value.NPDU;
+                this.addressType = addressType;
+                this.NPCI = npci;
+                this.npdu = npdu;
             }
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_SystemBroadcast.req"]["EMI2/IMI2"].value;
             controlField1; // Control field 1
@@ -803,11 +716,7 @@ class EMI {
                 buffer.writeUInt8(this.messageCode, 0);
                 this.controlField1.buffer.copy(buffer, 1); // Assuming controlField1 is a Buffer
                 KNXHelper_1.KNXHelper.GetAddress_(this.destinationAddress).copy(buffer, 4);
-                buffer[6] =
-                    0x00 |
-                        ((this.addressType << 7) |
-                            (this.NPCI << 4) |
-                            (this.npdu.length & 0x0f));
+                buffer[6] = 0x00 | ((this.addressType << 7) | (this.NPCI << 4) | (this.npdu.length & 0x0f));
                 this.npdu.copy(buffer, 7);
                 return buffer;
             }
@@ -832,46 +741,31 @@ class EMI {
                 const controlField1 = new ControlField_1.ControlField(controlFieldByte);
                 const octet6 = buffer.readUInt8(6);
                 const addressType = (octet6 >> 7) & 0x01;
-                const NPCI = (octet6 >> 4) & 0x07;
+                const NPCI_val = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const destinationAddressBuf = buffer.subarray(4, 6);
-                //[cite_start]// Usually System Broadcast destination is 0/0/0 or specific [cite: 297]
                 const destinationAddress = KNXHelper_1.KNXHelper.GetAddress(destinationAddressBuf, addressType === EnumControlFieldExtended_1.AddressType.GROUP ? "/" : ".");
                 const npdu = buffer.subarray(7, 7 + length);
-                return new LSystemBroadcastReq({
-                    control: {
-                        priority: controlField1.priority,
-                        confirm: controlField1.confirm,
-                        ackRequest: controlField1.ackRequest,
-                    },
-                    destinationAddress: destinationAddress,
-                    addressType: addressType,
-                    NPCI: NPCI,
-                    NPDU: npdu,
-                });
+                return new LSystemBroadcastReq(controlField1.priority, controlField1.confirm, controlField1.ackRequest, destinationAddress, addressType, NPCI_val, npdu);
             }
         },
         "L_SystemBroadcast.con": class LSystemBroadcastCon {
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("L_Data.ind must be an object with specific properties.");
-                }
+            constructor(notRepeat, priority, confirm, destinationAddress, addressType, npci, npdu) {
                 this.controlField1 = new ControlField_1.ControlField(0);
-                this.controlField1.repeat = value.control.notRepeat;
-                this.controlField1.priority = value.control.priority;
-                this.controlField1.confirm = value.control.confirm;
-                this.messageCode =
-                    MessageCodeField_1.MESSAGE_CODE_FIELD["L_SystemBroadcast.con"]["EMI2/IMI2"].value;
-                if (KNXHelper_1.KNXHelper.isValidGroupAddress(value.destinationAddress) ||
-                    KNXHelper_1.KNXHelper.isValidIndividualAddress(value.destinationAddress)) {
-                    this.destinationAddress = value.destinationAddress;
+                this.controlField1.repeat = notRepeat;
+                this.controlField1.priority = priority;
+                this.controlField1.confirm = confirm;
+                this.messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_SystemBroadcast.con"]["EMI2/IMI2"].value;
+                if (KNXHelper_1.KNXHelper.isValidGroupAddress(destinationAddress) ||
+                    KNXHelper_1.KNXHelper.isValidIndividualAddress(destinationAddress)) {
+                    this.destinationAddress = destinationAddress;
                 }
                 else {
                     throw new Error("The Destination Address is invalid Group Address or Individual Address");
                 }
-                this.addressType = value.addressType;
-                this.NPCI = value.NPCI;
-                this.npdu = value.NPDU;
+                this.addressType = addressType;
+                this.NPCI = npci;
+                this.npdu = npdu;
             }
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_SystemBroadcast.con"]["EMI2/IMI2"].value;
             controlField1; // Control field 1
@@ -885,11 +779,7 @@ class EMI {
                 buffer.writeUInt8(this.messageCode, 0);
                 this.controlField1.buffer.copy(buffer, 1); // Assuming controlField1 is a Buffer
                 KNXHelper_1.KNXHelper.GetAddress_(this.destinationAddress).copy(buffer, 4);
-                buffer[6] =
-                    0x00 |
-                        ((this.addressType << 7) |
-                            (this.NPCI << 4) |
-                            (this.npdu.length & 0x0f));
+                buffer[6] = 0x00 | ((this.addressType << 7) | (this.NPCI << 4) | (this.npdu.length & 0x0f));
                 this.npdu.copy(buffer, 7);
                 return buffer;
             }
@@ -914,48 +804,36 @@ class EMI {
                 const controlField1 = new ControlField_1.ControlField(controlFieldByte);
                 const octet6 = buffer.readUInt8(6);
                 const addressType = (octet6 >> 7) & 0x01;
-                const NPCI = (octet6 >> 4) & 0x07;
+                const NPCI_val = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const destinationAddressBuf = buffer.subarray(4, 6);
                 const destinationAddress = KNXHelper_1.KNXHelper.GetAddress(destinationAddressBuf, addressType === EnumControlFieldExtended_1.AddressType.GROUP ? "/" : ".");
                 const npdu = buffer.subarray(7, 7 + length);
-                return new LSystemBroadcastCon({
-                    control: {
-                        priority: controlField1.priority,
-                        confirm: controlField1.confirm,
-                        notRepeat: controlField1.repeat,
-                    },
-                    destinationAddress: destinationAddress,
-                    addressType: addressType,
-                    NPCI: NPCI,
-                    NPDU: npdu,
-                });
+                return new LSystemBroadcastCon(controlField1.repeat, controlField1.priority, controlField1.confirm, destinationAddress, addressType, NPCI_val, npdu);
             }
         },
         "L_SystemBroadcast.ind": class LSystemBroadcastInd {
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("L_Data.ind must be an object with specific properties.");
-                }
+            constructor(priority, confirm, notRepeat, sourceAddress, destinationAddress, addressType, npci, npdu) {
                 this.controlField1 = new ControlField_1.ControlField(0);
-                this.controlField1.priority = value.control.priority;
-                if (KNXHelper_1.KNXHelper.isValidGroupAddress(value.destinationAddress) ||
-                    KNXHelper_1.KNXHelper.isValidIndividualAddress(value.destinationAddress)) {
-                    this.destinationAddress = value.destinationAddress;
+                this.controlField1.priority = priority;
+                this.controlField1.confirm = confirm;
+                this.controlField1.repeat = notRepeat;
+                if (KNXHelper_1.KNXHelper.isValidGroupAddress(destinationAddress) ||
+                    KNXHelper_1.KNXHelper.isValidIndividualAddress(destinationAddress)) {
+                    this.destinationAddress = destinationAddress;
                 }
                 else {
                     throw new Error("The Destination Address is invalid Group Address or Individual Address");
                 }
-                if (KNXHelper_1.KNXHelper.isValidGroupAddress(value.sourceAddress) ||
-                    KNXHelper_1.KNXHelper.isValidIndividualAddress(value.sourceAddress)) {
-                    this.sourceAddress = value.sourceAddress;
+                if (KNXHelper_1.KNXHelper.isValidGroupAddress(sourceAddress) || KNXHelper_1.KNXHelper.isValidIndividualAddress(sourceAddress)) {
+                    this.sourceAddress = sourceAddress;
                 }
                 else {
                     throw new Error("The Source Address is invalid Group Address or Individual Address");
                 }
-                this.addressType = value.addressType;
-                this.NPCI = value.NPCI;
-                this.npdu = value.NPDU;
+                this.addressType = addressType;
+                this.NPCI = npci;
+                this.npdu = npdu;
             }
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["L_SystemBroadcast.ind"]["EMI2/IMI2"].value;
             controlField1; // Control field 1
@@ -988,12 +866,7 @@ class EMI {
                 };
             }
             static fromBuffer(buffer) {
-                //[cite_start]// Spec[cite: 147]: L_SystemBroadcast.ind -> 28h
-                // Note: The class property 'messageCode' above references L_SystemBroadcast.CON (error in original class?),
-                // I will try to match the code found in the buffer.
-                // Strict check:
-                if (buffer.readUInt8(0) !==
-                    MessageCodeField_1.MESSAGE_CODE_FIELD["L_SystemBroadcast.ind"]["EMI2/IMI2"].value) {
+                if (buffer.readUInt8(0) !== MessageCodeField_1.MESSAGE_CODE_FIELD["L_SystemBroadcast.ind"]["EMI2/IMI2"].value) {
                     throw new Error("This messageCode is not L_SystemBroadcast.ind");
                 }
                 const controlFieldByte = buffer.readUInt8(1);
@@ -1001,29 +874,13 @@ class EMI {
                 const sourceAddressBuf = buffer.subarray(2, 4);
                 const sourceAddress = KNXHelper_1.KNXHelper.GetAddress(sourceAddressBuf, ".");
                 const octet6 = buffer.readUInt8(6);
-                //[cite_start]// Address type not strictly in bit 7 for SystemBroadcast Indication according to [cite: 312] diagram?
-                //[cite_start]// Diagram [cite: 313] shows Octet 6 (byte 7 in 1-based, so index 6) has NPCI and LG.
-                // Address Type is implicit in System Broadcast?
-                // But your constructor demands AddressType.
-                // Assuming standard L_Data frame layout for consistency with your class structure.
-                const addressType = (octet6 >> 7) & 0x01; // May be always 1 (Group)?
-                const NPCI = (octet6 >> 4) & 0x07;
+                const addressType = (octet6 >> 7) & 0x01;
+                const NPCI_val = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const destinationAddressBuf = buffer.subarray(4, 6);
                 const destinationAddress = KNXHelper_1.KNXHelper.GetAddress(destinationAddressBuf, addressType === EnumControlFieldExtended_1.AddressType.GROUP ? "/" : ".");
                 const npdu = buffer.subarray(7, 7 + length);
-                return new LSystemBroadcastInd({
-                    control: {
-                        priority: controlField1.priority,
-                        confirm: controlField1.confirm,
-                        notRepeat: controlField1.repeat,
-                    },
-                    sourceAddress: sourceAddress,
-                    destinationAddress: destinationAddress,
-                    addressType: addressType,
-                    NPCI: NPCI,
-                    NPDU: npdu,
-                });
+                return new LSystemBroadcastInd(controlField1.priority, controlField1.confirm, controlField1.repeat, sourceAddress, destinationAddress, addressType, NPCI_val, npdu);
             }
         },
     };
@@ -1039,22 +896,19 @@ class EMI {
             controlField;
             destinationAddress; // Individual address
             TPDU; // Transport Layer Protocol Data Unit
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Data_Individual.req must be an object with specific properties.");
-                }
+            constructor(frameType, repeat, systemBroadcast, priority, ackRequest, confirm, destinationAddress, tpdu) {
                 this.controlField = new ControlField_1.ControlField(0);
-                this.controlField.frameType = value.control.frameType;
-                this.controlField.repeat = value.control.repeat;
-                this.controlField.systemBroadcast = value.control.systemBroadcast;
-                this.controlField.priority = value.control.priority;
-                this.controlField.ackRequest = value.control.ackRequest;
-                this.controlField.confirm = value.control.confirm;
-                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(value.destinationAddress)) {
+                this.controlField.frameType = frameType;
+                this.controlField.repeat = repeat;
+                this.controlField.systemBroadcast = systemBroadcast;
+                this.controlField.priority = priority;
+                this.controlField.ackRequest = ackRequest;
+                this.controlField.confirm = confirm;
+                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(destinationAddress)) {
                     throw new Error("The Destination Address must be a valid Individual Address");
                 }
-                this.destinationAddress = value.destinationAddress;
-                this.TPDU = value.TPDU;
+                this.destinationAddress = destinationAddress;
+                this.TPDU = tpdu;
             }
             /**
              * Converts the N_Data_Individual.req message to a Buffer.
@@ -1097,7 +951,6 @@ class EMI {
                 }
                 const controlFieldByte = buffer.readUInt8(1);
                 const controlField = new ControlField_1.ControlField(controlFieldByte);
-                // Octets 3-4 (index 2-3) son 0x0000 (unused) en la Request.
                 const destinationAddressBuf = buffer.subarray(4, 6);
                 const destinationAddress = KNXHelper_1.KNXHelper.GetAddress(destinationAddressBuf, ".");
                 const length = buffer.readUInt8(6) & 0x0f; // Octet 7: LG (lower 4 bits)
@@ -1105,18 +958,7 @@ class EMI {
                     throw new Error(`Buffer length mismatch. Expected at least ${7 + length} bytes, got ${buffer.length}`);
                 }
                 const TPDU = buffer.subarray(7, 7 + length);
-                return new NDataIndividualReq({
-                    control: {
-                        frameType: controlField.frameType,
-                        repeat: controlField.repeat,
-                        systemBroadcast: controlField.systemBroadcast,
-                        priority: controlField.priority,
-                        ackRequest: controlField.ackRequest,
-                        confirm: controlField.confirm,
-                    },
-                    destinationAddress: destinationAddress,
-                    TPDU: TPDU,
-                });
+                return new NDataIndividualReq(controlField.frameType, controlField.repeat, controlField.systemBroadcast, controlField.priority, controlField.ackRequest, controlField.confirm, destinationAddress, TPDU);
             }
         },
         "N_Data_Individual.con": class NDataIndividualCon {
@@ -1124,19 +966,14 @@ class EMI {
             controlField;
             destinationAddress; // Destination address
             TPDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Data_Individual.con must be an object with specific properties.");
-                }
+            constructor(confirm, destinationAddress, tpdu) {
                 this.controlField = new ControlField_1.ControlField(0);
-                this.controlField.confirm = value.control.confirm; // Set confirm bit
-                // The spec (3.3.5.3) for N_Data_Individual.con control field is "unused c".
-                // Therefore, priority should not be set here.
-                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(value.destinationAddress)) {
+                this.controlField.confirm = confirm; // Set confirm bit
+                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(destinationAddress)) {
                     throw new Error("The Destination Address must be a valid Individual Address");
                 }
-                this.destinationAddress = value.destinationAddress;
-                this.TPDU = value.TPDU;
+                this.destinationAddress = destinationAddress;
+                this.TPDU = tpdu;
             }
             /**
              * Converts the N_Data_Individual.con message to a Buffer.
@@ -1179,7 +1016,6 @@ class EMI {
                 }
                 const controlFieldByte = buffer.readUInt8(1);
                 const controlField = new ControlField_1.ControlField(controlFieldByte);
-                // Octets 3-4 (index 2-3) son 0x0000 (unused).
                 const destinationAddressBuf = buffer.subarray(4, 6);
                 const destinationAddress = KNXHelper_1.KNXHelper.GetAddress(destinationAddressBuf, ".");
                 const length = buffer.readUInt8(6) & 0x0f; // Octet 7: LG (lower 4 bits)
@@ -1187,13 +1023,7 @@ class EMI {
                     throw new Error(`Buffer length mismatch. Expected at least ${7 + length} bytes, got ${buffer.length}`);
                 }
                 const TPDU = buffer.subarray(7, 7 + length);
-                return new NDataIndividualCon({
-                    control: {
-                        confirm: controlField.confirm,
-                    },
-                    destinationAddress: destinationAddress,
-                    TPDU: TPDU,
-                });
+                return new NDataIndividualCon(controlField.confirm, destinationAddress, TPDU);
             }
         },
         "N_Data_Individual.ind": class NDataIndividualInd {
@@ -1203,22 +1033,19 @@ class EMI {
             destinationAddress; // Individual address
             hopCount; // 4 bits (formerly NPCI)
             TPDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Data_Individual.ind must be an object with specific properties.");
-                }
+            constructor(priority, sourceAddress, destinationAddress, hopCount, tpdu) {
                 this.controlField = new ControlField_1.ControlField(0);
-                this.controlField.priority = value.control.priority;
-                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(value.sourceAddress)) {
+                this.controlField.priority = priority;
+                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(sourceAddress)) {
                     throw new Error("The Source Address must be a valid Individual Address");
                 }
-                this.sourceAddress = value.sourceAddress;
-                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(value.destinationAddress)) {
+                this.sourceAddress = sourceAddress;
+                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(destinationAddress)) {
                     throw new Error("The Destination Address must be a valid Individual Address");
                 }
-                this.destinationAddress = value.destinationAddress;
-                this.hopCount = value.hopCount;
-                this.TPDU = value.TPDU;
+                this.destinationAddress = destinationAddress;
+                this.hopCount = hopCount;
+                this.TPDU = tpdu;
             }
             /**
              * Converts the N_Data_Individual.ind message to a Buffer.
@@ -1235,7 +1062,6 @@ class EMI {
                 // Octet 7: hop_count_type (bits 6-4) | octet count (LG) (bits 3-0)
                 buffer.writeUInt8(((this.hopCount & 0x0f) << 4) | (this.TPDU.length & 0x0f), 6);
                 this.TPDU.copy(buffer, 7); // Octet 8...n: TPDU
-                // buffer.writeUInt8(checksum(buffer.subarray(0, buffer.length - 1)), buffer.length - 1); // Calculate FCS
                 return buffer;
             }
             /**
@@ -1275,15 +1101,7 @@ class EMI {
                     throw new Error(`Buffer length mismatch. Expected at least ${7 + length} bytes, got ${buffer.length}`);
                 }
                 const TPDU = buffer.subarray(7, 7 + length);
-                return new NDataIndividualInd({
-                    control: {
-                        priority: controlField.priority,
-                    },
-                    sourceAddress: sourceAddress,
-                    destinationAddress: destinationAddress,
-                    hopCount: hopCount,
-                    TPDU: TPDU,
-                });
+                return new NDataIndividualInd(controlField.priority, sourceAddress, destinationAddress, hopCount, TPDU);
             }
         },
         "N_Data_Group.req": class NDataGroupReq {
@@ -1291,19 +1109,14 @@ class EMI {
             controlField;
             destinationAddress; // Group address
             APDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Data_Group.req must be an object with specific properties.");
-                }
+            constructor(priority, destinationAddress, apdu) {
                 this.controlField = new ControlField_1.ControlField(0);
-                this.controlField.priority = value.control.priority;
-                // The spec (3.3.5.5) for N_Data_Group.req control field is "unused priority unused".
-                // Therefore, ackRequest should not be set here.
-                if (!KNXHelper_1.KNXHelper.isValidGroupAddress(value.destinationAddress)) {
+                this.controlField.priority = priority;
+                if (!KNXHelper_1.KNXHelper.isValidGroupAddress(destinationAddress)) {
                     throw new Error("The Destination Address must be a valid Group Address");
                 }
-                this.destinationAddress = value.destinationAddress;
-                this.APDU = value.APDU;
+                this.destinationAddress = destinationAddress;
+                this.APDU = apdu;
             }
             /**
              * Converts the N_Data_Group.req message to a Buffer.
@@ -1320,7 +1133,6 @@ class EMI {
                 // Octet 7: hop_count_type (bits 7-4, default 0) | octet count (LG) (bits 3-0)
                 buffer.writeUInt8(this.APDU.length & 0x0f, 6); // Default hop_count_type is 0
                 this.APDU.copy(buffer, 7); // Octet 8...n: TPDU
-                // buffer.writeUInt8(checksum(buffer.subarray(0, buffer.length - 1)), buffer.length - 1); // Calculate FCS
                 return buffer;
             }
             /**
@@ -1347,7 +1159,6 @@ class EMI {
                 }
                 const controlFieldByte = buffer.readUInt8(1);
                 const controlField = new ControlField_1.ControlField(controlFieldByte);
-                // Octets 3-4 (index 2-3) son 0x0000 (unused) en la Request.
                 const destinationAddressBuf = buffer.subarray(4, 6);
                 const destinationAddress = KNXHelper_1.KNXHelper.GetAddress(destinationAddressBuf, "/"); // Dirección de Grupo
                 const length = buffer.readUInt8(6) & 0x0f; // Octet 7: LG (lower 4 bits), upper 4 bits unused (hop count = 0)
@@ -1355,13 +1166,7 @@ class EMI {
                     throw new Error(`Buffer length mismatch. Expected at least ${7 + length} bytes, got ${buffer.length}`);
                 }
                 const APDU = buffer.subarray(7, 7 + length);
-                return new NDataGroupReq({
-                    control: {
-                        priority: controlField.priority,
-                    },
-                    destinationAddress: destinationAddress,
-                    APDU: APDU,
-                });
+                return new NDataGroupReq(controlField.priority, destinationAddress, APDU);
             }
         },
         "N_Data_Group.con": class NDataGroupCon {
@@ -1369,19 +1174,14 @@ class EMI {
             controlField;
             destinationAddress; // Group address
             APDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Data_Group.con must be an object with specific properties.");
-                }
+            constructor(confirm, destinationAddress, apdu) {
                 this.controlField = new ControlField_1.ControlField(0);
-                this.controlField.confirm = value.control.confirm;
-                // The spec (3.3.5.6) for N_Data_Group.con control field is "unused c".
-                // Therefore, priority should not be set here.
-                if (!KNXHelper_1.KNXHelper.isValidGroupAddress(value.destinationAddress)) {
+                this.controlField.confirm = confirm;
+                if (!KNXHelper_1.KNXHelper.isValidGroupAddress(destinationAddress)) {
                     throw new Error("The Destination Address must be a valid Group Address");
                 }
-                this.destinationAddress = value.destinationAddress;
-                this.APDU = value.APDU;
+                this.destinationAddress = destinationAddress;
+                this.APDU = apdu;
             }
             /**
              * Converts the N_Data_Group.con message to a Buffer.
@@ -1397,7 +1197,6 @@ class EMI {
                 KNXHelper_1.KNXHelper.GetAddress_(this.destinationAddress).copy(buffer, 4); // Octets 5-6: Destination Address
                 buffer.writeUInt8(this.APDU.length & 0x0f, 6); // Octet 7: LG (octet count), upper 4 bits unused
                 this.APDU.copy(buffer, 7); // Octet 8...n: TPDU
-                // buffer.writeUInt8(checksum(buffer.subarray(0, buffer.length - 1)), buffer.length - 1); // Calculate FCS
                 return buffer;
             }
             /**
@@ -1424,7 +1223,6 @@ class EMI {
                 }
                 const controlFieldByte = buffer.readUInt8(1);
                 const controlField = new ControlField_1.ControlField(controlFieldByte);
-                // Octets 3-4 (index 2-3) son 0x0000 (unused) en la Confirmation.
                 const destinationAddressBuf = buffer.subarray(4, 6);
                 const destinationAddress = KNXHelper_1.KNXHelper.GetAddress(destinationAddressBuf, "/"); // Dirección de Grupo
                 const length = buffer.readUInt8(6) & 0x0f; // Octet 7: LG (lower 4 bits), upper 4 bits unused
@@ -1432,13 +1230,7 @@ class EMI {
                     throw new Error(`Buffer length mismatch. Expected at least ${7 + length} bytes, got ${buffer.length}`);
                 }
                 const APDU = buffer.subarray(7, 7 + length);
-                return new NDataGroupCon({
-                    control: {
-                        confirm: controlField.confirm,
-                    },
-                    destinationAddress: destinationAddress,
-                    APDU: APDU,
-                });
+                return new NDataGroupCon(controlField.confirm, destinationAddress, APDU);
             }
         },
         "N_Data_Group.ind": class NDataGroupInd {
@@ -1448,22 +1240,19 @@ class EMI {
             destinationAddress; // Group address
             hopCount; // 4 bits (formerly NPCI)
             APDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Data_Group.ind must be an object with specific properties.");
-                }
+            constructor(priority, sourceAddress, destinationAddress, hopCount, apdu) {
                 this.controlField = new ControlField_1.ControlField(0);
-                this.controlField.priority = value.control.priority;
-                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(value.sourceAddress)) {
+                this.controlField.priority = priority;
+                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(sourceAddress)) {
                     throw new Error("The Source Address must be a valid Individual Address");
                 }
-                this.sourceAddress = value.sourceAddress;
-                if (!KNXHelper_1.KNXHelper.isValidGroupAddress(value.destinationAddress)) {
+                this.sourceAddress = sourceAddress;
+                if (!KNXHelper_1.KNXHelper.isValidGroupAddress(destinationAddress)) {
                     throw new Error("The Destination Address must be a valid Group Address");
                 }
-                this.destinationAddress = value.destinationAddress;
-                this.hopCount = value.hopCount;
-                this.APDU = value.APDU;
+                this.destinationAddress = destinationAddress;
+                this.hopCount = hopCount;
+                this.APDU = apdu;
             }
             /**
              * Converts the N_Data_Group.ind message to a Buffer.
@@ -1480,7 +1269,6 @@ class EMI {
                 // Octet 7: hop_count_type (bits 7-4) | octet count (LG) (bits 3-0)
                 buffer.writeUInt8(((this.hopCount & 0x0f) << 4) | (this.APDU.length & 0x0f), 6);
                 this.APDU.copy(buffer, 7); // Octet 8...n: TPDU
-                // buffer.writeUInt8(checksum(buffer.subarray(0, buffer.length - 1)), buffer.length - 1); // Calculate FCS
                 return buffer;
             }
             /**
@@ -1509,9 +1297,6 @@ class EMI {
                 }
                 const controlFieldByte = buffer.readUInt8(1);
                 const controlField = new ControlField_1.ControlField(controlFieldByte);
-                // ATENCIÓN: Tu toBuffer para esta clase escribe 0x0000 en el Source Address (índice 2-3).
-                // Sin embargo, la especificación KNX (y tu constructor) requiere una Source Address (Individual).
-                // Asumiré la estructura CORRECTA del protocolo (Source Address en 2-3) para la lectura.
                 const sourceAddressBuf = buffer.subarray(2, 4);
                 const sourceAddress = KNXHelper_1.KNXHelper.GetAddress(sourceAddressBuf, "."); // Dirección Individual
                 const destinationAddressBuf = buffer.subarray(4, 6);
@@ -1523,15 +1308,7 @@ class EMI {
                     throw new Error(`Buffer length mismatch. Expected at least ${7 + length} bytes, got ${buffer.length}`);
                 }
                 const APDU = buffer.subarray(7, 7 + length);
-                return new NDataGroupInd({
-                    control: {
-                        priority: controlField.priority,
-                    },
-                    sourceAddress: sourceAddress,
-                    destinationAddress: destinationAddress,
-                    hopCount: hopCount,
-                    APDU: APDU,
-                });
+                return new NDataGroupInd(controlField.priority, sourceAddress, destinationAddress, hopCount, APDU);
             }
         },
         "N_Data_Broadcast.req": class NDataBroadcastReq {
@@ -1539,16 +1316,13 @@ class EMI {
             controlField;
             hopCount;
             TPDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Data_Broadcast.req must be an object with specific properties.");
-                }
+            constructor(priority, hopCountType, tpdu) {
                 this.controlField = new ControlField_1.ControlField(0);
-                this.controlField.priority = value.control.priority;
+                this.controlField.priority = priority;
                 // The spec (3.3.5.8) for N_Data_Broadcast.req control field is "unused priority unused".
                 // Therefore, ackRequest should not be set here.
-                this.hopCount = value.hopCountType;
-                this.TPDU = value.TPDU;
+                this.hopCount = hopCountType;
+                this.TPDU = tpdu;
             }
             /**
              * Converts the N_Data_Broadcast.req message to a Buffer.
@@ -1589,31 +1363,22 @@ class EMI {
                 // Broadcast suele asumir destino 0/0/0 implícito o explícito en bytes 4-5
                 // const dest = KNXHelper.GetAddress(buffer.subarray(4, 6), "/");
                 const octet6 = buffer.readUInt8(6);
-                const hopCount = octet6 & 0x70;
+                const hopCount = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const TPDU = buffer.subarray(7, 7 + length);
-                return new NDataBroadcastReq({
-                    control: {
-                        priority: controlField.priority,
-                    },
-                    hopCountType: hopCount,
-                    TPDU: TPDU,
-                });
+                return new NDataBroadcastReq(controlField.priority, hopCount, TPDU);
             }
         },
         "N_Data_Broadcast.con": class NDataBroadcastCon {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["N_Data_Broadcast.con"]["EMI2/IMI2"].value;
             controlField;
             TPDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Data_Broadcast.con must be an object with specific properties.");
-                }
+            constructor(confirm, tpdu) {
                 this.controlField = new ControlField_1.ControlField(0);
-                this.controlField.confirm = value.control.confirm;
+                this.controlField.confirm = confirm;
                 // The spec (3.3.5.9) for N_Data_Broadcast.con control field is "unused unused unused c".
                 // Therefore, priority should not be set here.
-                this.TPDU = value.TPDU;
+                this.TPDU = tpdu;
             }
             /**
              * Converts the N_Data_Broadcast.con message to a Buffer.
@@ -1673,12 +1438,7 @@ class EMI {
                     throw new Error(`Buffer mismatch: Expected ${length} bytes of TPDU, available ${buffer.length - 7}`);
                 }
                 const TPDU = buffer.subarray(7, 7 + length);
-                return new NDataBroadcastCon({
-                    control: {
-                        confirm: controlField.confirm,
-                    },
-                    TPDU: TPDU,
-                });
+                return new NDataBroadcastCon(controlField.confirm, TPDU);
             }
         },
         "N_Data_Broadcast.ind": class NDataBroadcastInd {
@@ -1687,18 +1447,15 @@ class EMI {
             sourceAddress; // Individual address
             hopCount; // 4 bits (formerly NPCI)
             TPDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Data_Broadcast.ind must be an object with specific properties.");
-                }
+            constructor(priority, sourceAddress, hopCount, tpdu) {
                 this.controlField = new ControlField_1.ControlField(0);
-                this.controlField.priority = value.control.priority;
-                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(value.sourceAddress)) {
+                this.controlField.priority = priority;
+                if (!KNXHelper_1.KNXHelper.isValidIndividualAddress(sourceAddress)) {
                     throw new Error("The Source Address must be a valid Individual Address");
                 }
-                this.sourceAddress = value.sourceAddress;
-                this.hopCount = value.hopCount;
-                this.TPDU = value.TPDU;
+                this.sourceAddress = sourceAddress;
+                this.hopCount = hopCount;
+                this.TPDU = tpdu;
             }
             /**
              * Converts the N_Data_Broadcast.ind message to a Buffer.
@@ -1744,43 +1501,35 @@ class EMI {
                 if (typeof sourceAddress !== "string")
                     throw new Error("The sourceAddress is not string, this fatal error is from GetAddress, dont be ignore it");
                 const octet6 = buffer.readUInt8(6);
-                const hopCount = octet6 & 0x70;
+                const hopCount = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const TPDU = buffer.subarray(7, 7 + length);
-                return new NDataBroadcastInd({
-                    control: { priority: controlField.priority },
-                    sourceAddress: sourceAddress,
-                    hopCount: hopCount,
-                    TPDU: TPDU,
-                });
+                return new NDataBroadcastInd(controlField.priority, sourceAddress, hopCount, TPDU);
             }
         },
         "N_Poll_Data.req": class NPollDataReq {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["N_Poll_Data.req"]["EMI2/IMI2"].value;
             control = 0xf0; // Fixed control byte for N_Poll_Data.req (similar to L_Poll_Data)
-            #pollingGroup = Buffer.alloc(1, 0);
-            #nrOfSlots = 0;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Poll_Data.req must be an object with specific properties.");
-                }
-                this.nrOfSlots = value.nrOfSlots;
-                this.pollingGroup = value.pollingGroup;
+            _pollingGroup = Buffer.alloc(1, 0);
+            _nrOfSlots = 0;
+            constructor(pollingGroup, nrOfSlots) {
+                this.nrOfSlots = nrOfSlots;
+                this.pollingGroup = pollingGroup;
             }
             set pollingGroup(value) {
                 const convertToAddress = KNXHelper_1.KNXHelper.GetAddress_(value);
-                this.#pollingGroup = convertToAddress;
+                this._pollingGroup = convertToAddress;
             }
             get pollingGroup() {
-                return KNXHelper_1.KNXHelper.GetAddress(this.#pollingGroup, "/", true); // Se supone que es un dirección de grupo;
+                return KNXHelper_1.KNXHelper.GetAddress(this._pollingGroup, "/", true); // Se supone que es un dirección de grupo;
             }
             set nrOfSlots(value) {
                 if (value < 0 || value > 7)
                     throw new Error("The nrOfSlots value must be 4 bits (0-7)");
-                this.#nrOfSlots = value;
+                this._nrOfSlots = value;
             }
             get nrOfSlots() {
-                return this.#nrOfSlots;
+                return this._nrOfSlots;
             }
             /**
              * Converts the N_Poll_Data.req message to a Buffer.
@@ -1791,10 +1540,10 @@ class EMI {
             toBuffer() {
                 const buffer = Buffer.alloc(7);
                 let octet7 = 0;
-                octet7 = octet7 | (this.#nrOfSlots & 0x0f); // NrOfSlots in lower 4 bits
+                octet7 = octet7 | (this._nrOfSlots & 0x0f); // NrOfSlots in lower 4 bits
                 buffer.writeUInt8(this.messageCode, 0); // Octet 1: m_code
                 buffer.writeUInt8(this.control, 1); // Octet 2: Control
-                this.#pollingGroup.copy(buffer, 0); // Octets 5-6: Polling Group
+                this._pollingGroup.copy(buffer, 0); // Octets 5-6: Polling Group
                 buffer.writeUInt8(octet7, 6); // Octet 7: NrOfSlots (bits 3-0)
                 return buffer;
             }
@@ -1806,8 +1555,8 @@ class EMI {
                 return {
                     messageCode: `Codigo de mensaje: ${this.messageCode}`,
                     control: `Control: ${this.control.toString(16).padStart(2, "0")}`,
-                    pollingGroup: `Grupo de sondeo: ${this.#pollingGroup}`,
-                    nrOfSlots: `Número de ranuras: ${this.#nrOfSlots}`,
+                    pollingGroup: `Grupo de sondeo: ${this._pollingGroup}`,
+                    nrOfSlots: `Número de ranuras: ${this._nrOfSlots}`,
                     rawValue: `Valor numérico: ${this.toBuffer().toString("hex")}`,
                 };
             }
@@ -1826,41 +1575,34 @@ class EMI {
                     throw new Error("The pollingGroup is not string, this fatal error is from GetAddress, dont be ignore it");
                 const octet6 = buffer.readUInt8(6);
                 const nrOfSlots = octet6 & 0x0f; // Ejemplo, ver spec
-                return new NPollDataReq({
-                    // Ajustar propiedades al constructor
-                    pollingGroup: pollingGroup,
-                    nrOfSlots: nrOfSlots,
-                });
+                return new NPollDataReq(pollingGroup, nrOfSlots);
             }
         },
         "N_Poll_Data.con": class NPollDataCon {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["N_Poll_Data.con"]["EMI2/IMI2"].value;
             control = 0xf0; // Fixed control byte for N_Poll_Data.con
-            #pollingGroup = Buffer.alloc(1, 0);
-            #nrOfSlots = 0;
+            _pollingGroup = Buffer.alloc(1, 0);
+            _nrOfSlots = 0;
             pollData; // Polled data
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new Error("N_Poll_Data.con must be an object with specific properties.");
-                }
-                this.pollingGroup = value.pollingGroup;
-                this.nrOfSlots = value.nrOfSlots;
-                this.pollData = value.pollData;
+            constructor(pollingGroup, nrOfSlots, pollData) {
+                this.pollingGroup = pollingGroup;
+                this.nrOfSlots = nrOfSlots;
+                this.pollData = pollData;
             }
             set pollingGroup(value) {
                 const convertToAddress = KNXHelper_1.KNXHelper.GetAddress_(value);
-                this.#pollingGroup = convertToAddress;
+                this._pollingGroup = convertToAddress;
             }
             get pollingGroup() {
-                return KNXHelper_1.KNXHelper.GetAddress(this.#pollingGroup, "/", true); // Se supone que es un dirección de grupo;
+                return KNXHelper_1.KNXHelper.GetAddress(this._pollingGroup, "/", true); // Se supone que es un dirección de grupo;
             }
             set nrOfSlots(value) {
                 if (value < 0 || value > 7)
                     throw new Error("The nrOfSlots value must be 4 bits (0-7)");
-                this.#nrOfSlots = value;
+                this._nrOfSlots = value;
             }
             get nrOfSlots() {
-                return this.#nrOfSlots;
+                return this._nrOfSlots;
             }
             /**
              * Converts the N_Poll_Data.con message to a Buffer.
@@ -1874,8 +1616,8 @@ class EMI {
                 buffer.writeUInt8(this.control, 1); // Octet 2
                 // Rellenar Octetos 3-4 (Source) con ceros explícitos si es necesario
                 buffer.writeUInt16BE(0x0000, 2);
-                this.#pollingGroup.copy(buffer, 4); // Octets 5-6
-                const octet7 = this.#nrOfSlots & 0x0f;
+                this._pollingGroup.copy(buffer, 4); // Octets 5-6
+                const octet7 = this._nrOfSlots & 0x0f;
                 buffer.writeUInt8(octet7, 6); // Octet 7
                 this.pollData.copy(buffer, 7); // Octet 8...
                 return buffer;
@@ -1888,8 +1630,8 @@ class EMI {
                 return {
                     messageCode: `Codigo de mensaje: ${this.messageCode}`,
                     control: `Control: ${this.control.toString(16).padStart(2, "0")}`,
-                    pollingGroup: `Grupo de sondeo: ${this.#pollingGroup}`,
-                    nrOfSlots: `Número de ranuras: ${this.#nrOfSlots}`,
+                    pollingGroup: `Grupo de sondeo: ${this._pollingGroup}`,
+                    nrOfSlots: `Número de ranuras: ${this._nrOfSlots}`,
                     pollData: `pollData: ${this.pollData.toString("hex")}`,
                     pollData_Length: `${this.pollData.length} octets`,
                     rawValue: `Valor numérico: ${this.toBuffer().toString("hex")}`,
@@ -1930,11 +1672,8 @@ class EMI {
                 // Octet 7...: Poll Data
                 // Todo lo que resta del buffer es data
                 const pollData = buffer.subarray(7);
-                return new NPollDataCon({
-                    pollingGroup: pollingGroupStr,
-                    nrOfSlots: nrOfSlots, // Cast a 'bits4' o number según tu tipo
-                    pollData: pollData,
-                });
+                return new NPollDataCon(pollingGroupStr, nrOfSlots, // Cast a 'bits4' o number según tu tipo
+                pollData);
             }
         },
     };
@@ -1943,11 +1682,8 @@ class EMI {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["T_Connect.req"]["EMI2/IMI2"].value;
             control = 0x00;
             destinationAddress;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TConnectReq.name);
-                }
-                this.destinationAddress = value.destinationAddress;
+            constructor(destinationAddress) {
+                this.destinationAddress = destinationAddress;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(6);
@@ -1977,20 +1713,15 @@ class EMI {
                     throw new Error("The destinationAddress is undefined or null, this fatal error is from GetAddress, dont be ignore it");
                 if (typeof destinationAddress !== "string")
                     throw new Error("The destinationAddress is not string, this fatal error is from GetAddress, dont be ignore it");
-                return new TConnectReq({
-                    destinationAddress: destinationAddress,
-                });
+                return new TConnectReq(destinationAddress);
             }
         },
         "T_Connect.con": class TConnectCon {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["T_Connect.con"]["EMI2/IMI2"].value;
             control = 0x00;
             destinationAddress;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TConnectCon.name);
-                }
-                this.destinationAddress = value.destinationAddress;
+            constructor(destinationAddress) {
+                this.destinationAddress = destinationAddress;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(6);
@@ -2019,25 +1750,20 @@ class EMI {
                     throw new Error("The destinationAddress is undefined or null, this fatal error is from GetAddress, dont be ignore it");
                 if (typeof destinationAddress !== "string")
                     throw new Error("The destinationAddress is not string, this fatal error is from GetAddress, dont be ignore it");
-                return new TConnectCon({
-                    destinationAddress: destinationAddress,
-                });
+                return new TConnectCon(destinationAddress);
             }
         },
         "T_Connect.ind": class TConnectInd {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["T_Connect.ind"]["EMI2/IMI2"].value;
             control = new ControlField_1.ControlField();
             sourceAddress;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TConnectInd.name);
-                }
-                this.sourceAddress = value.sourceAddress;
-                this.control.ackRequest = value.control.ackRequest;
-                this.control.frameType = value.control.frameType;
-                this.control.repeat = value.control.repeat;
-                this.control.systemBroadcast = value.control.systemBroadcast;
-                this.control.priority = value.control.priority;
+            constructor(sourceAddress, frameType, repeat, systemBroadcast, priority, ackRequest) {
+                this.sourceAddress = sourceAddress;
+                this.control.ackRequest = ackRequest;
+                this.control.frameType = frameType;
+                this.control.repeat = repeat;
+                this.control.systemBroadcast = systemBroadcast;
+                this.control.priority = priority;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(6);
@@ -2067,26 +1793,14 @@ class EMI {
                     throw new Error("The sourceAddress is undefined or null, this fatal error is from GetAddress, dont be ignore it");
                 if (typeof sourceAddress !== "string")
                     throw new Error("The sourceAddress is not string, this fatal error is from GetAddress, dont be ignore it");
-                return new TConnectInd({
-                    control: {
-                        ackRequest: control.ackRequest,
-                        frameType: control.frameType,
-                        repeat: control.repeat,
-                        systemBroadcast: control.systemBroadcast,
-                        priority: control.priority,
-                        confirm: control.confirm,
-                    },
-                    sourceAddress: sourceAddress,
-                });
+                return new TConnectInd(sourceAddress, control.frameType, control.repeat, control.systemBroadcast, control.priority, control.ackRequest);
             }
         },
         "T_Disconnect.req": class TDisconnectReq {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["T_Disconnect.req"]["EMI2/IMI2"].value;
             control = 0x00;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDisconnectReq.name);
-                }
+            constructor() {
+                // No tiene parámetros
             }
             toBuffer() {
                 const buffer = Buffer.alloc(6);
@@ -2096,7 +1810,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                 };
             }
             static fromBuffer(buffer) {
@@ -2106,21 +1820,19 @@ class EMI {
                 if (buffer.length < 6)
                     throw new Error("Buffer too short");
                 // No hay datos adicionales en req
-                return new TDisconnectReq({});
+                return new TDisconnectReq();
             }
         },
         "T_Disconnect.con": class TDisconnectCon {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["T_Disconnect.con"]["EMI2/IMI2"].value;
             control = new ControlField_1.ControlField();
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDisconnectCon.name);
-                }
-                this.control.ackRequest = value.control.ackRequest;
-                this.control.frameType = value.control.frameType;
-                this.control.repeat = value.control.repeat;
-                this.control.systemBroadcast = value.control.systemBroadcast;
-                this.control.priority = value.control.priority;
+            constructor(frameType, repeat, systemBroadcast, priority, ackRequest, confirm) {
+                this.control.ackRequest = ackRequest;
+                this.control.frameType = frameType;
+                this.control.repeat = repeat;
+                this.control.systemBroadcast = systemBroadcast;
+                this.control.priority = priority;
+                this.control.confirm = confirm;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(6);
@@ -2131,8 +1843,8 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
-                    control: this.control,
+                    messageCode: this.messageCode.toString(),
+                    control: this.control.describe(),
                 };
             }
             static fromBuffer(buffer) {
@@ -2142,30 +1854,19 @@ class EMI {
                 if (buffer.length < 6)
                     throw new Error("Buffer too short");
                 const control = new ControlField_1.ControlField(buffer.readUInt8(1));
-                return new TDisconnectCon({
-                    control: {
-                        ackRequest: control.ackRequest,
-                        frameType: control.frameType,
-                        repeat: control.repeat,
-                        systemBroadcast: control.systemBroadcast,
-                        priority: control.priority,
-                        confirm: control.confirm,
-                    },
-                });
+                return new TDisconnectCon(control.frameType, control.repeat, control.systemBroadcast, control.priority, control.ackRequest, control.confirm);
             }
         },
         "T_Disconnect.ind": class TDisconnectInd {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["T_Disconnect.ind"]["EMI2/IMI2"].value;
             control = new ControlField_1.ControlField();
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDisconnectInd.name);
-                }
-                this.control.ackRequest = value.control.ackRequest;
-                this.control.frameType = value.control.frameType;
-                this.control.repeat = value.control.repeat;
-                this.control.systemBroadcast = value.control.systemBroadcast;
-                this.control.priority = value.control.priority;
+            constructor(frameType, repeat, systemBroadcast, priority, ackRequest, confirm) {
+                this.control.ackRequest = ackRequest;
+                this.control.frameType = frameType;
+                this.control.repeat = repeat;
+                this.control.systemBroadcast = systemBroadcast;
+                this.control.priority = priority;
+                this.control.confirm = confirm;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(6);
@@ -2176,8 +1877,8 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
-                    control: this.control,
+                    messageCode: this.messageCode.toString(),
+                    control: this.control.describe(),
                 };
             }
             static fromBuffer(buffer) {
@@ -2187,16 +1888,7 @@ class EMI {
                 if (buffer.length < 6)
                     throw new Error("Buffer too short");
                 const control = new ControlField_1.ControlField(buffer.readUInt8(1));
-                return new TDisconnectInd({
-                    control: {
-                        ackRequest: control.ackRequest,
-                        frameType: control.frameType,
-                        repeat: control.repeat,
-                        systemBroadcast: control.systemBroadcast,
-                        priority: control.priority,
-                        confirm: control.confirm,
-                    },
-                });
+                return new TDisconnectInd(control.frameType, control.repeat, control.systemBroadcast, control.priority, control.ackRequest, control.confirm);
             }
         },
         "T_Data_Connected.req": class TDataConnectedReq {
@@ -2204,13 +1896,10 @@ class EMI {
             control = new ControlField_1.ControlField();
             APDU;
             hopCount;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataConnectedReq.name);
-                }
-                this.control.priority = value.control.priority;
-                this.APDU = value.APDU;
-                this.hopCount = value.hopCount;
+            constructor(priority, hopCount, apdu) {
+                this.control.priority = priority;
+                this.APDU = apdu;
+                this.hopCount = hopCount;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2223,9 +1912,9 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
-                    control: this.control,
-                    hopCount: this.hopCount,
+                    messageCode: this.messageCode.toString(),
+                    control: this.control.describe(),
+                    hopCount: this.hopCount.toString(),
                 };
             }
             static fromBuffer(buffer) {
@@ -2243,23 +1932,16 @@ class EMI {
                 if (buffer.length < 7 + length)
                     throw new Error("Buffer data incomplete");
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataConnectedReq({
-                    control: { priority: control.priority },
-                    hopCount: hopCount,
-                    APDU: apdu,
-                });
+                return new TDataConnectedReq(control.priority, hopCount, apdu);
             }
         },
         "T_Data_Connected.con": class TDataConnectedCon {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["T_Data_Connected.con"]["EMI2/IMI2"].value;
             control = new ControlField_1.ControlField();
             APDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataConnectedCon.name);
-                }
-                this.control.confirm = value.control.confirm;
-                this.APDU = value.APDU;
+            constructor(confirm, apdu) {
+                this.control.confirm = confirm;
+                this.APDU = apdu;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2273,7 +1955,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     APDU: this.APDU.toString("hex"),
                 };
@@ -2287,10 +1969,7 @@ class EMI {
                 const control = new ControlField_1.ControlField(buffer.readUInt8(1));
                 const length = buffer.readUInt8(6) & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataConnectedCon({
-                    control: { confirm: control.confirm },
-                    APDU: apdu,
-                });
+                return new TDataConnectedCon(control.confirm, apdu);
             }
         },
         "T_Data_Connected.ind": class TDataConnectedInd {
@@ -2299,14 +1978,11 @@ class EMI {
             sourceAddress;
             APDU;
             hopCount;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataConnectedInd.name);
-                }
-                this.control.priority = value.control.priority;
-                this.sourceAddress = value.sourceAddress;
-                this.APDU = value.APDU;
-                this.hopCount = value.hopCount;
+            constructor(priority, sourceAddress, apdu, hopCount) {
+                this.control.priority = priority;
+                this.sourceAddress = sourceAddress;
+                this.APDU = apdu;
+                this.hopCount = hopCount;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2321,7 +1997,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     sourceAddress: this.sourceAddress,
                     APDU: this.APDU.toString("hex"),
@@ -2344,12 +2020,7 @@ class EMI {
                 const hopCount = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataConnectedInd({
-                    control: { priority: control.priority },
-                    sourceAddress: sourceAddress,
-                    hopCount: hopCount,
-                    APDU: apdu,
-                });
+                return new TDataConnectedInd(control.priority, sourceAddress, apdu, hopCount);
             }
         },
         "T_Data_Group.req": class TDataGroupReq {
@@ -2357,13 +2028,10 @@ class EMI {
             control = new ControlField_1.ControlField();
             APDU;
             hopCount;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataGroupReq.name);
-                }
-                this.control.priority = value.control.priority;
-                this.APDU = value.APDU;
-                this.hopCount = value.hopCount;
+            constructor(priority, hopCount, apdu) {
+                this.control.priority = priority;
+                this.APDU = apdu;
+                this.hopCount = hopCount;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2377,9 +2045,9 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
-                    hopCount: this.hopCount,
+                    hopCount: this.hopCount.toString(),
                     APDU: this.APDU.toString("hex"),
                 };
             }
@@ -2394,23 +2062,16 @@ class EMI {
                 const hopCount = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataGroupReq({
-                    control: { priority: control.priority },
-                    hopCount: hopCount,
-                    APDU: apdu,
-                });
+                return new TDataGroupReq(control.priority, hopCount, apdu);
             }
         },
         "T_Data_Group.con": class TDataGroupCon {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["T_Data_Group.con"]["EMI2/IMI2"].value;
             control = new ControlField_1.ControlField();
             data;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataGroupCon.name);
-                }
-                this.control.confirm = value.control.confirm;
-                this.data = value.data;
+            constructor(confirm, data) {
+                this.control.confirm = confirm;
+                this.data = data;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.data.length); // Tamaño mínimo según documento
@@ -2424,7 +2085,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                 };
             }
@@ -2437,22 +2098,16 @@ class EMI {
                 const control = new ControlField_1.ControlField(buffer.readUInt8(1));
                 const length = buffer.readUInt8(6) & 0x0f;
                 const data = buffer.subarray(7, 7 + length);
-                return new TDataGroupCon({
-                    control: { confirm: control.confirm },
-                    data: data,
-                });
+                return new TDataGroupCon(control.confirm, data);
             }
         },
         "T_Data_Group.ind": class TDataGroupInd {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["T_Data_Group.ind"]["EMI2/IMI2"].value;
             control = new ControlField_1.ControlField();
             APDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataGroupInd.name);
-                }
-                this.control.priority = value.control.priority;
-                this.APDU = value.APDU;
+            constructor(priority, apdu) {
+                this.control.priority = priority;
+                this.APDU = apdu;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2466,7 +2121,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     APDU: this.APDU.toString("hex"),
                 };
@@ -2481,10 +2136,7 @@ class EMI {
                 const octet6 = buffer.readUInt8(6);
                 const length = octet6 & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataGroupInd({
-                    control: { priority: control.priority },
-                    APDU: apdu,
-                });
+                return new TDataGroupInd(control.priority, apdu);
             }
         },
         "T_Data_Individual.req": class TDataIndividualReq {
@@ -2493,14 +2145,11 @@ class EMI {
             destinationAddress;
             APDU;
             hopCount;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataIndividualReq.name);
-                }
-                this.control.priority = value.control.priority;
-                this.destinationAddress = value.destinationAddress;
-                this.APDU = value.APDU;
-                this.hopCount = value.hopCount;
+            constructor(priority, destinationAddress, hopCount, apdu) {
+                this.control.priority = priority;
+                this.destinationAddress = destinationAddress;
+                this.APDU = apdu;
+                this.hopCount = hopCount;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2514,10 +2163,10 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     destinationAddress: this.destinationAddress,
-                    hopCount: this.hopCount,
+                    hopCount: this.hopCount.toString(),
                     APDU: this.APDU.toString("hex"),
                 };
             }
@@ -2538,12 +2187,7 @@ class EMI {
                 const hopCount = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataIndividualReq({
-                    control: { priority: control.priority },
-                    destinationAddress: destinationAddress,
-                    hopCount: hopCount,
-                    APDU: apdu,
-                });
+                return new TDataIndividualReq(control.priority, destinationAddress, hopCount, apdu);
             }
         },
         "T_Data_Individual.con": class TDataIndividualCon {
@@ -2551,13 +2195,10 @@ class EMI {
             control = new ControlField_1.ControlField();
             destinationAddress;
             APDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataIndividualCon.name);
-                }
-                this.control.confirm = value.control.confirm;
-                this.destinationAddress = value.destinationAddress;
-                this.APDU = value.APDU;
+            constructor(confirm, destinationAddress, apdu) {
+                this.control.confirm = confirm;
+                this.destinationAddress = destinationAddress;
+                this.APDU = apdu;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2571,7 +2212,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     destinationAddress: this.destinationAddress,
                 };
@@ -2591,11 +2232,7 @@ class EMI {
                     throw new Error("The destinationAddress is not string, this fatal error is from GetAddress, dont be ignore it");
                 const length = buffer.readUInt8(6) & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataIndividualCon({
-                    control: { confirm: control.confirm },
-                    destinationAddress: destinationAddress,
-                    APDU: apdu,
-                });
+                return new TDataIndividualCon(control.confirm, destinationAddress, apdu);
             }
         },
         "T_Data_Individual.ind": class TDataIndividualInd {
@@ -2605,15 +2242,12 @@ class EMI {
             destinationAddress;
             APDU;
             hopCount;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataIndividualInd.name);
-                }
-                this.control.priority = value.control.priority;
-                this.sourceAddress = value.sourceAddress;
-                this.destinationAddress = value.destinationAddress;
-                this.APDU = value.APDU;
-                this.hopCount = value.hopCount;
+            constructor(priority, sourceAddress, destinationAddress, hopCount, apdu) {
+                this.control.priority = priority;
+                this.sourceAddress = sourceAddress;
+                this.destinationAddress = destinationAddress;
+                this.APDU = apdu;
+                this.hopCount = hopCount;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2628,7 +2262,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     sourceAddress: this.sourceAddress,
                     destinationAddress: this.destinationAddress,
@@ -2657,13 +2291,7 @@ class EMI {
                 const hopCount = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataIndividualInd({
-                    control: { priority: control.priority },
-                    sourceAddress: sourceAddress,
-                    destinationAddress: destinationAddress,
-                    hopCount: hopCount,
-                    APDU: apdu,
-                });
+                return new TDataIndividualInd(control.priority, sourceAddress, destinationAddress, hopCount, apdu);
             }
         },
         "T_Data_Broadcast.req": class TDataBroadcastReq {
@@ -2671,13 +2299,10 @@ class EMI {
             control = new ControlField_1.ControlField();
             APDU;
             hopCount;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataBroadcastReq.name);
-                }
-                this.control.priority = value.control.priority;
-                this.APDU = value.APDU;
-                this.hopCount = value.hopCount;
+            constructor(priority, hopCount, apdu) {
+                this.control.priority = priority;
+                this.APDU = apdu;
+                this.hopCount = hopCount;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2690,9 +2315,9 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
-                    hopCount: this.hopCount,
+                    hopCount: this.hopCount.toString(),
                     APDU: this.APDU.toString("hex"),
                 };
             }
@@ -2707,23 +2332,16 @@ class EMI {
                 const hopCount = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataBroadcastReq({
-                    control: { priority: control.priority },
-                    hopCount: hopCount,
-                    APDU: apdu,
-                });
+                return new TDataBroadcastReq(control.priority, hopCount, apdu);
             }
         },
         "T_Data_Broadcast.con": class TDataBroadcastCon {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["T_Data_Broadcast.con"]["EMI2/IMI2"].value;
             control = new ControlField_1.ControlField();
             APDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataBroadcastCon.name);
-                }
-                this.control.confirm = value.control.confirm;
-                this.APDU = value.APDU;
+            constructor(confirm, apdu) {
+                this.control.confirm = confirm;
+                this.APDU = apdu;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2735,7 +2353,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                 };
             }
@@ -2748,10 +2366,7 @@ class EMI {
                 const control = new ControlField_1.ControlField(buffer.readUInt8(1));
                 const length = buffer.readUInt8(6) & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataBroadcastCon({
-                    control: { confirm: control.confirm },
-                    APDU: apdu,
-                });
+                return new TDataBroadcastCon(control.confirm, apdu);
             }
         },
         "T_Data_Broadcast.ind": class TDataBroadcastInd {
@@ -2760,14 +2375,11 @@ class EMI {
             sourceAddress;
             APDU;
             hopCount;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TDataBroadcastInd.name);
-                }
-                this.control.priority = value.control.priority;
-                this.sourceAddress = value.sourceAddress;
-                this.APDU = value.APDU;
-                this.hopCount = value.hopCount;
+            constructor(priority, sourceAddress, hopCount, apdu) {
+                this.control.priority = priority;
+                this.sourceAddress = sourceAddress;
+                this.APDU = apdu;
+                this.hopCount = hopCount;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -2781,7 +2393,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     sourceAddress: this.sourceAddress,
                     APDU: this.APDU.toString("hex"),
@@ -2803,12 +2415,7 @@ class EMI {
                 const hopCount = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new TDataBroadcastInd({
-                    control: { priority: control.priority },
-                    sourceAddress: sourceAddress,
-                    hopCount: hopCount,
-                    APDU: apdu,
-                });
+                return new TDataBroadcastInd(control.priority, sourceAddress, hopCount, apdu);
             }
         },
         "T_Poll_Data.req": class TPollDataReq {
@@ -2816,12 +2423,9 @@ class EMI {
             control = new ControlField_1.ControlField(0xf0);
             pollingGroup;
             numberOfSlots;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TPollDataReq.name);
-                }
-                this.pollingGroup = value.pollingGroup;
-                this.numberOfSlots = value.numberOfSlots;
+            constructor(pollingGroup, numberOfSlots) {
+                this.pollingGroup = pollingGroup;
+                this.numberOfSlots = numberOfSlots;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(7);
@@ -2835,10 +2439,10 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     pollingGroup: this.pollingGroup,
-                    numberOfSlots: this.numberOfSlots,
+                    numberOfSlots: this.numberOfSlots.toString(),
                 };
             }
             static fromBuffer(buffer) {
@@ -2849,18 +2453,14 @@ class EMI {
                     throw new Error("Buffer too short");
                 // Estructura: MC(0) | Ctrl(1) | Unused(2-3) | PollGroup(4-5) | Slots(6)
                 // Usamos separador "/" para grupos
-                const control = new ControlField_1.ControlField(buffer.readUInt8(1));
+                // const control = new ControlField(buffer.readUInt8(1));
                 const pollingGroup = KNXHelper_1.KNXHelper.GetAddress(buffer.subarray(4, 6), "/");
                 if (!pollingGroup)
                     throw new Error("The pollingGroup is undefined or null, this fatal error is from GetAddress, dont be ignore it");
                 if (typeof pollingGroup !== "string")
                     throw new Error("The pollingGroup is not string, this fatal error is from GetAddress, dont be ignore it");
                 const slots = buffer.readUInt8(6) & 0x0f;
-                return new TPollDataReq({
-                    control,
-                    pollingGroup: pollingGroup,
-                    numberOfSlots: slots,
-                });
+                return new TPollDataReq(pollingGroup, slots);
             }
         },
         "T_Poll_Data.con": class TPollDataCon {
@@ -2870,14 +2470,11 @@ class EMI {
             pollingGroup;
             pollData;
             nrOfSlots;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(TPollDataCon.name);
-                }
-                this.sourceAddress = value.sourceAddress;
-                this.pollingGroup = value.pollingGroup;
-                this.pollData = value.pollData;
-                this.nrOfSlots = value.nrOfSlots;
+            constructor(sourceAddress, pollingGroup, pollData, nrOfSlots) {
+                this.sourceAddress = sourceAddress;
+                this.pollingGroup = pollingGroup;
+                this.pollData = pollData;
+                this.nrOfSlots = nrOfSlots;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(7 + this.pollData.length);
@@ -2893,7 +2490,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     sourceAddress: this.sourceAddress,
                     pollingGroup: this.pollingGroup,
@@ -2906,7 +2503,7 @@ class EMI {
                     throw new Error("Invalid Code");
                 if (buffer.length < 7)
                     throw new Error("Buffer too short");
-                const control = new ControlField_1.ControlField(buffer.readUInt8(1));
+                // const control = new ControlField(buffer.readUInt8(1));
                 const sourceAddress = KNXHelper_1.KNXHelper.GetAddress(buffer.subarray(2, 4), ".");
                 const pollingGroup = KNXHelper_1.KNXHelper.GetAddress(buffer.subarray(4, 6), "/");
                 if (!sourceAddress)
@@ -2919,13 +2516,7 @@ class EMI {
                     throw new Error("The pollingGroup is not string, this fatal error is from GetAddress, dont be ignore it");
                 const slots = buffer.readUInt8(6) & 0x0f;
                 const data = buffer.subarray(7);
-                return new TPollDataCon({
-                    control,
-                    sourceAddress: sourceAddress,
-                    pollingGroup: pollingGroup,
-                    nrOfSlots: slots,
-                    pollData: data,
-                });
+                return new TPollDataCon(sourceAddress, pollingGroup, data, slots);
             }
         },
     };
@@ -2941,11 +2532,8 @@ class EMI {
         "M_Connect.ind": class MConnectInd {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["M_Connect.ind"]["EMI2/IMI2"].value;
             sourceAddress;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(MConnectInd.name);
-                }
-                this.sourceAddress = value.sourceAddress;
+            constructor(sourceAddress) {
+                this.sourceAddress = sourceAddress;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(6);
@@ -2958,7 +2546,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     sourceAddress: this.sourceAddress,
                 };
             }
@@ -2974,9 +2562,7 @@ class EMI {
                     throw new Error("The sourceAddress is undefined or null, this fatal error is from GetAddress, dont be ignore it");
                 if (typeof sourceAddress !== "string")
                     throw new Error("The sourceAddress is not string, this fatal error is from GetAddress, dont be ignore it");
-                return new MConnectInd({
-                    sourceAddress: sourceAddress,
-                });
+                return new MConnectInd(sourceAddress);
             }
         },
         "M_Disconnect.ind": class MDisconnectInd {
@@ -2993,7 +2579,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                 };
             }
             static fromBuffer(buffer) {
@@ -3009,13 +2595,10 @@ class EMI {
             control = new ControlField_1.ControlField();
             APDU;
             hopCount;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(MUserDataConnectedReq.name);
-                }
-                this.control.priority = value.control.priority;
-                this.APDU = value.APDU;
-                this.hopCount = value.hopCount;
+            constructor(priority, apdu, hopCount) {
+                this.control.priority = priority;
+                this.APDU = apdu;
+                this.hopCount = hopCount;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -3030,9 +2613,9 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
-                    hopCount: this.hopCount,
+                    hopCount: this.hopCount.toString(),
                     APDU: this.APDU.toString("hex"),
                 };
             }
@@ -3055,23 +2638,16 @@ class EMI {
                 // Asumiré para leer que la Data real empieza en 8 dado el conflicto, o leeremos desde 7 si el 0x02 es parte de la data.
                 // Estandarizando: Leemos el buffer restante como APDU.
                 const apdu = buffer.subarray(7, 7 + length);
-                return new MUserDataConnectedReq({
-                    control: { priority: control.priority },
-                    hopCount: hopCount,
-                    APDU: apdu,
-                });
+                return new MUserDataConnectedReq(control.priority, apdu, hopCount);
             }
         },
         "M_User_Data_Connected.con": class MUserDataConnectedCon {
             messageCode = MessageCodeField_1.MESSAGE_CODE_FIELD["M_User_Data_Connected.con"]["EMI2/IMI2"].value;
             control = new ControlField_1.ControlField();
             APDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(MUserDataConnectedCon.name);
-                }
-                this.control.confirm = value.control.confirm;
-                this.APDU = value.APDU;
+            constructor(confirm, apdu) {
+                this.control.confirm = confirm;
+                this.APDU = apdu;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -3086,7 +2662,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     APDU: this.APDU.toString("hex"),
                 };
@@ -3099,10 +2675,7 @@ class EMI {
                 const length = buffer.readUInt8(6) & 0x0f;
                 // Mismo conflicto del byte 7 (0x02). Leemos length bytes desde 7.
                 const apdu = buffer.subarray(7, 7 + length);
-                return new MUserDataConnectedCon({
-                    control: { confirm: control.confirm },
-                    APDU: apdu,
-                });
+                return new MUserDataConnectedCon(control.confirm, apdu);
             }
         },
         "M_User_Data_Connected.ind": class MUserDataConnectedInd {
@@ -3110,13 +2683,10 @@ class EMI {
             control = new ControlField_1.ControlField();
             sourceAddress;
             APDU;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(MUserDataConnectedInd.name);
-                }
-                this.control.priority = value.control.priority;
-                this.sourceAddress = value.sourceAddress;
-                this.APDU = value.APDU;
+            constructor(priority, sourceAddress, apdu) {
+                this.control.priority = priority;
+                this.sourceAddress = sourceAddress;
+                this.APDU = apdu;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.APDU.length);
@@ -3132,7 +2702,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     sourceAddress: this.sourceAddress,
                     APDU: this.APDU.toString("hex"),
@@ -3150,11 +2720,7 @@ class EMI {
                     throw new Error("The sourceAddress is not string, this fatal error is from GetAddress, dont be ignore it");
                 const length = buffer.readUInt8(6) & 0x0f;
                 const apdu = buffer.subarray(7, 7 + length);
-                return new MUserDataConnectedInd({
-                    control: { priority: control.priority },
-                    sourceAddress: sourceAddress,
-                    APDU: apdu,
-                });
+                return new MUserDataConnectedInd(control.priority, sourceAddress, apdu);
             }
         },
         "A_Data_Group.req": class ADataGroupReq {
@@ -3164,15 +2730,12 @@ class EMI {
             apci;
             data;
             hopCount;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(ADataGroupReq.name);
-                }
-                this.control.priority = value.control.priority;
-                this.sap = value.sap;
-                this.apci = value.apci;
-                this.data = value.data;
-                this.hopCount = value.hopCount;
+            constructor(priority, sap, apci, data, hopCount) {
+                this.control.priority = priority;
+                this.sap = sap;
+                this.apci = apci;
+                this.data = data;
+                this.hopCount = hopCount;
             }
             toBuffer() {
                 const buffer = Buffer.alloc(8 + this.data.length);
@@ -3191,10 +2754,10 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
-                    sap: this.sap,
-                    hopCount: this.hopCount,
+                    sap: this.sap.toString(),
+                    hopCount: this.hopCount.toString(),
                     apci: this.apci.describe(),
                     data: this.data.toString("hex"),
                 };
@@ -3219,13 +2782,7 @@ class EMI {
                 // La data suele empezar en el byte 1 de la APDU (masked) o byte 2, depende de la longitud (<= 6 bits o > 6 bits).
                 // Por simplicidad devolvemos el payload crudo, ajusta según tu parser APCI.
                 const data = fullAPDU;
-                return new ADataGroupReq({
-                    control: { priority: control.priority },
-                    sap: sap,
-                    apci: newAPCI,
-                    data: data,
-                    hopCount: hopCount,
-                });
+                return new ADataGroupReq(control.priority, sap, newAPCI, data, hopCount);
             }
         },
         "A_Data_Group.con": class ADataGroupCon {
@@ -3234,14 +2791,11 @@ class EMI {
             sap;
             apci;
             data;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(ADataGroupCon.name);
-                }
-                this.control.confirm = value.control.confirm;
-                this.sap = value.sap;
-                this.apci = value.apci;
-                this.data = value.data;
+            constructor(confirm, sap, apci, data) {
+                this.control.confirm = confirm;
+                this.sap = sap;
+                this.apci = apci;
+                this.data = data;
             }
             toBuffer() {
                 const totalLength = this.data.length;
@@ -3260,9 +2814,9 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
-                    sap: this.sap,
+                    sap: this.sap.toString(),
                     apci: this.apci.describe(),
                     data: this.data.toString("hex"),
                 };
@@ -3279,12 +2833,7 @@ class EMI {
                 const apci2 = buffer[8] & 0xc0;
                 const fullAPCI = apci1 | (apci2 >> 4);
                 const apci = new APCI_1.APCI(fullAPCI);
-                return new ADataGroupCon({
-                    control: { confirm: control.confirm },
-                    sap: sap,
-                    apci: apci,
-                    data: fullAPDU,
-                });
+                return new ADataGroupCon(control.confirm, sap, apci, fullAPDU);
             }
         },
         "A_Data_Group.ind": class ADataGroupInd {
@@ -3293,14 +2842,11 @@ class EMI {
             sap;
             apci;
             data;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(ADataGroupInd.name);
-                }
-                this.control.priority = value.control.priority;
-                this.sap = value.sap;
-                this.apci = value.apci;
-                this.data = value.data;
+            constructor(priority, sap, apci, data) {
+                this.control.priority = priority;
+                this.sap = sap;
+                this.apci = apci;
+                this.data = data;
             }
             toBuffer() {
                 const totalLength = this.data.length;
@@ -3319,9 +2865,9 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
-                    sap: this.sap,
+                    sap: this.sap.toString(),
                     apci: this.apci.describe(),
                     data: this.data.toString("hex"),
                 };
@@ -3338,12 +2884,7 @@ class EMI {
                 const apci2 = buffer[8] & 0xc0;
                 const fullAPCI = apci1 | (apci2 >> 4);
                 const apci = new APCI_1.APCI(fullAPCI);
-                return new ADataGroupInd({
-                    control: { priority: control.priority },
-                    sap: sap,
-                    apci: apci,
-                    data: fullAPDU,
-                });
+                return new ADataGroupInd(control.priority, sap, apci, fullAPDU);
             }
         },
         "M_User_Data_Individual.req": class MUserDataIndividualReq {
@@ -3353,15 +2894,12 @@ class EMI {
             apci = new APCI_1.APCI(APCIEnum_1.APCIEnum.A_UserMemory_Read_Protocol_Data_Unit);
             data;
             hopCount;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(MUserDataIndividualReq.name);
-                }
-                this.control.priority = value.control.priority;
-                this.destinationAddress = value.destinationAddress;
+            constructor(priority, destinationAddress, data, hopCount) {
+                this.control.priority = priority;
+                this.destinationAddress = destinationAddress;
                 this.apci.command = APCIEnum_1.APCIEnum.A_UserMemory_Read_Protocol_Data_Unit; // 2C0
-                this.data = value.data;
-                this.hopCount = value.hopCount;
+                this.data = data;
+                this.hopCount = hopCount;
             }
             toBuffer() {
                 const totalLength = this.data.length;
@@ -3379,10 +2917,10 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     destinationAddress: this.destinationAddress,
-                    hopCount: this.hopCount,
+                    hopCount: this.hopCount.toString(),
                     apci: this.apci.describe(),
                     data: this.data.toString("hex"),
                 };
@@ -3401,12 +2939,7 @@ class EMI {
                 const hopCount = (octet6 >> 4) & 0x07;
                 const length = octet6 & 0x0f;
                 const data = buffer.subarray(7, 7 + length);
-                return new MUserDataIndividualReq({
-                    control: { priority: control.priority },
-                    destinationAddress: destAddr,
-                    hopCount: hopCount,
-                    data: data,
-                });
+                return new MUserDataIndividualReq(control.priority, destAddr, data, hopCount);
             }
         },
         "M_User_Data_Individual.con": class MUserDataIndividualCon {
@@ -3415,14 +2948,11 @@ class EMI {
             destinationAddress;
             apci = new APCI_1.APCI(APCIEnum_1.APCIEnum.A_UserMemory_Read_Protocol_Data_Unit);
             data;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(MUserDataIndividualCon.name);
-                }
-                this.control.confirm = value.control.confirm;
-                this.destinationAddress = value.destinationAddress;
+            constructor(confirm, destinationAddress, data) {
+                this.control.confirm = confirm;
+                this.destinationAddress = destinationAddress;
                 this.apci.command = APCIEnum_1.APCIEnum.A_UserMemory_Read_Protocol_Data_Unit; // 2C0
-                this.data = value.data;
+                this.data = data;
             }
             toBuffer() {
                 const totalLength = this.data.length;
@@ -3440,7 +2970,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     destinationAddress: this.destinationAddress,
                     apci: this.apci.describe(),
@@ -3459,11 +2989,7 @@ class EMI {
                     throw new Error("The destAddr is not string, this fatal error is from GetAddress, dont be ignore it");
                 const length = buffer.readUInt8(6) & 0x0f;
                 const data = buffer.subarray(7, 7 + length);
-                return new MUserDataIndividualCon({
-                    control: { confirm: control.confirm },
-                    destinationAddress: destAddr,
-                    data: data,
-                });
+                return new MUserDataIndividualCon(control.confirm, destAddr, data);
             }
         },
         "M_User_Data_Individual.ind": class MUserDataIndividualInd {
@@ -3473,15 +2999,12 @@ class EMI {
             destinationAddress;
             apci = new APCI_1.APCI(APCIEnum_1.APCIEnum.A_UserMemory_Read_Protocol_Data_Unit);
             data;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(MUserDataIndividualInd.name);
-                }
-                this.control.priority = value.control.priority;
-                this.sourceAddress = value.sourceAddress;
-                this.destinationAddress = value.destinationAddress;
+            constructor(priority, sourceAddress, destinationAddress, data) {
+                this.control.priority = priority;
+                this.sourceAddress = sourceAddress;
+                this.destinationAddress = destinationAddress;
                 this.apci.command = APCIEnum_1.APCIEnum.A_UserMemory_Read_Protocol_Data_Unit; // 2C0
-                this.data = value.data;
+                this.data = data;
             }
             toBuffer() {
                 const totalLength = this.data.length;
@@ -3500,7 +3023,7 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     sourceAddress: this.sourceAddress,
                     destinationAddress: this.destinationAddress,
@@ -3525,12 +3048,7 @@ class EMI {
                     throw new Error("The destAddr is not string, this fatal error is from GetAddress, dont be ignore it");
                 const length = buffer.readUInt8(6) & 0x0f;
                 const data = buffer.subarray(7, 7 + length);
-                return new MUserDataIndividualInd({
-                    control: { priority: control.priority },
-                    sourceAddress: sourceAddr,
-                    destinationAddress: destAddr,
-                    data: data,
-                });
+                return new MUserDataIndividualInd(control.priority, sourceAddr, destAddr, data);
             }
         },
         "A_Poll_Data.req": class APollDataReq {
@@ -3538,12 +3056,9 @@ class EMI {
             pollingGroup;
             numberOfSlots;
             control;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(APollDataReq.name);
-                }
-                this.pollingGroup = value.pollingGroup;
-                this.numberOfSlots = value.numberOfSlots;
+            constructor(pollingGroup, numberOfSlots) {
+                this.pollingGroup = pollingGroup;
+                this.numberOfSlots = numberOfSlots;
                 this.control = new ControlField_1.ControlField(0xf0);
             }
             toBuffer() {
@@ -3558,10 +3073,10 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     pollingGroup: this.pollingGroup,
-                    numberOfSlots: this.numberOfSlots,
+                    numberOfSlots: this.numberOfSlots.toString(),
                 };
             }
             static fromBuffer(buffer) {
@@ -3575,10 +3090,7 @@ class EMI {
                 if (typeof pollGroup !== "string")
                     throw new Error("The pollGroup is not string, this fatal error is from GetAddress, dont be ignore it");
                 const slots = buffer.readUInt8(6) & 0x0f;
-                return new APollDataReq({
-                    pollingGroup: pollGroup,
-                    numberOfSlots: slots,
-                });
+                return new APollDataReq(pollGroup, slots);
             }
         },
         "A_Poll_Data.con": class APollDataCon {
@@ -3588,14 +3100,11 @@ class EMI {
             numberOfSlots;
             pollData;
             control;
-            constructor(value) {
-                if (typeof value !== "object" || value === null) {
-                    throw new InvalidInputObject(APollDataCon.name);
-                }
-                this.sourceAddress = value.sourceAddress;
-                this.pollingGroup = value.pollingGroup;
-                this.numberOfSlots = value.numberOfSlots;
-                this.pollData = value.pollData;
+            constructor(sourceAddress, pollingGroup, numberOfSlots, pollData) {
+                this.sourceAddress = sourceAddress;
+                this.pollingGroup = pollingGroup;
+                this.numberOfSlots = numberOfSlots;
+                this.pollData = pollData;
                 this.control = new ControlField_1.ControlField(0xf0);
             }
             toBuffer() {
@@ -3611,11 +3120,11 @@ class EMI {
             }
             describe() {
                 return {
-                    messageCode: this.messageCode,
+                    messageCode: this.messageCode.toString(),
                     control: this.control.describe(),
                     sourceAddress: this.sourceAddress,
                     pollingGroup: this.pollingGroup,
-                    numberOfSlots: this.numberOfSlots,
+                    numberOfSlots: this.numberOfSlots.toString(),
                     pollData: this.pollData.toString("hex"),
                 };
             }
@@ -3639,12 +3148,7 @@ class EMI {
                 const slots = buffer.readUInt8(6) & 0x0f;
                 // Offset 7: Data
                 const pollData = buffer.subarray(7);
-                return new APollDataCon({
-                    sourceAddress: sourceAddress,
-                    pollingGroup: pollingGroup,
-                    numberOfSlots: slots,
-                    pollData: pollData,
-                });
+                return new APollDataCon(sourceAddress, pollingGroup, slots, pollData);
             }
         },
     };