diff --git a/Architekture.md b/Architekture.md
deleted file mode 100644
index 88eb1ce..0000000
--- a/Architekture.md
+++ /dev/null
@@ -1,31 +0,0 @@
-# Library architecture
-
-* `ZigbeeNetworkManager(ZigbeeNetworkInterfaceType)`: This is the main entry point for using the library. Here you can specify which interface should be used.
-  * `ZigbeeNetworkInterface` Create a generic interface depending on the selected `ZigbeeNetworkInterfaceType`
-    * `ZigbeeUartInterface`
-        * `ZigbeeUartInterfaceNxp` (WIP)
-        * `ZigbeeUartInterfaceDeconz` (TODO)
-        * `ZigbeeUartInterfaceNordic` (TODO)
-
-  * `ZigbeeNetwork(ZigbeeNetworkInterface)`
-    PROPERTY `panId`
-    PROPERTY `channel`
-    PROPERTY `type`
-    ...  
-
-    * List of `ZigbeeNode(ZigbeeNetworkInterface)`
-      PROPERTY `ieeeAddress`
-      PROPERTY `shortAddress`
-      PROPERTY `nodeDescriptor`
-      PROPERTY `powerDescriptor`
-
-      * List of `ZigbeeNodeEndpoint(ZigbeeNetworkInterface)`
-        property `profile`
-        property `deviceType`
-        * List of `InputCluster`
-            * List of `Attributes`
-            * List of `Commands`
-        * List of `OutputCluster`
-            * List of `Attributes`
-            * List of `Commands`
-
diff --git a/README.md b/README.md
index 54a0572..79d8087 100644
--- a/README.md
+++ b/README.md
@@ -11,8 +11,8 @@ Depending on your available hardware following gateway modules are supported
 
 > Note: the firmware erquires an entire rework and implement the APS layer
 
-* ~~JN5168 (SoM)~~
-* ~~JN5169 (USB Stick)~~
+* JN5168 (SoM)
+* JN5169 (USB Stick)
 
 ## deCONZ
 
diff --git a/libnymea-zigbee/zigbeenetworkdatabase.cpp b/libnymea-zigbee/zigbeenetworkdatabase.cpp
index ee7db2b..db77f27 100644
--- a/libnymea-zigbee/zigbeenetworkdatabase.cpp
+++ b/libnymea-zigbee/zigbeenetworkdatabase.cpp
@@ -141,7 +141,7 @@ QList<ZigbeeNode *> ZigbeeNetworkDatabase::loadNodes()
                     endpoint->m_manufacturerName = basicCluster->attribute(ZigbeeClusterBasic::AttributeManufacturerName).dataType().toString();
 
                 if (basicCluster->hasAttribute(ZigbeeClusterBasic::AttributeModelIdentifier))
-                    endpoint->m_modelIdentifier = basicCluster->attribute(ZigbeeClusterBasic::AttributeManufacturerName).dataType().toString();
+                    endpoint->m_modelIdentifier = basicCluster->attribute(ZigbeeClusterBasic::AttributeModelIdentifier).dataType().toString();
 
                 if (basicCluster->hasAttribute(ZigbeeClusterBasic::AttributeSwBuildId))
                     endpoint->m_softwareBuildId = basicCluster->attribute(ZigbeeClusterBasic::AttributeSwBuildId).dataType().toString();