diff --git a/device-types/MikroTik/CCR2004-1G-12S+2XS.yaml b/device-types/MikroTik/CCR2004-1G-12S+2XS.yaml
index b6a7e8f9..2bc6f304 100644
--- a/device-types/MikroTik/CCR2004-1G-12S+2XS.yaml
+++ b/device-types/MikroTik/CCR2004-1G-12S+2XS.yaml
@@ -2,7 +2,7 @@
 manufacturer: MikroTik
 model: CCR2004-1G-12S+2XS
 slug: ccr2004-1g-12s-plus2sx
-part_number: ccr2004-1g-12s+2xs
+part_number: CCR2004-1G-12S+2XS
 is_full_depth: false
 u_height: 1
 interfaces:
diff --git a/device-types/MikroTik/CRS112-8P-4S-IN.yaml b/device-types/MikroTik/CRS112-8P-4S-IN.yaml
index 494973df..5a70e851 100644
--- a/device-types/MikroTik/CRS112-8P-4S-IN.yaml
+++ b/device-types/MikroTik/CRS112-8P-4S-IN.yaml
@@ -2,33 +2,57 @@
 manufacturer: MikroTik
 model: CRS112-8P-4S-IN
 slug: crs112-8p-4s-in
+part_number: CRS112-8P-4S
 is_full_depth: false
 u_height: 1
 interfaces:
   - name: ether1
+    label: "1"
     type: 1000base-t
   - name: ether2
+    label: "2"
     type: 1000base-t
   - name: ether3
+    label: "3"
     type: 1000base-t
   - name: ether4
+    label: "4"
     type: 1000base-t
   - name: ether5
+    label: "5"
     type: 1000base-t
   - name: ether6
+    label: "6"
     type: 1000base-t
   - name: ether7
+    label: "7"
     type: 1000base-t
   - name: ether8
+    label: "8"
     type: 1000base-t
   - name: sfp1
+    label: "9"
     type: 1000base-x-sfp
   - name: sfp2
+    label: "10"
     type: 1000base-x-sfp
   - name: sfp3
+    label: "11"
     type: 1000base-x-sfp
   - name: sfp4
+    label: "12"
     type: 1000base-x-sfp
+power-ports:
+  - name: psu1
+    label: DC IN 18-28V
+    type: dc-terminal
+    maximum_draw: 160
+  - name: psu2
+    label: DC IN 48-57V
+    type: dc-terminal
+    maximum_draw: 160
 console-ports:
   - name: serial0
+    label: CONSOLE
     type: rj-45
+comments: 8x Gigabit Ethernet Smart Switch with PoE-out, 4x SFP cages, 400MHz CPU, 128MB RAM, desktop case, RouterOS L5
diff --git a/device-types/MikroTik/CRS305-1G-4S+IN.yaml b/device-types/MikroTik/CRS305-1G-4S+IN.yaml
index 209e73c2..484989be 100644
--- a/device-types/MikroTik/CRS305-1G-4S+IN.yaml
+++ b/device-types/MikroTik/CRS305-1G-4S+IN.yaml
@@ -2,19 +2,36 @@
 manufacturer: MikroTik
 model: CRS305-1G-4S+IN
 slug: crs305-1g-4splus-in
+part_number: CRS305-1G-4S+
 is_full_depth: false
 u_height: 1
 interfaces:
   - name: sfp-sfpplus1
+    label: SFP+ 1
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus2
+    label: SFP+ 2
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus3
+    label: SFP+ 3
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus4
+    label: SFP+ 4
     type: 10gbase-x-sfpp
   - name: ether1
+    label: ETH/BOOT
     type: 1000base-t
+power-ports:
+  - name: psu1
+    label: DC1
+    type: dc-terminal
+    maximum_draw: 18
+  - name: psu2
+    label: DC2
+    type: dc-terminal
+    maximum_draw: 18
 console-ports:
   - name: serial0
-    type: rj-45
+    description: header on board
+    type: other
+comments: Five-port desktop switch with one Gigabit Ethernet port and four SFP+ 10Gbps ports.
diff --git a/device-types/MikroTik/CRS309-1G-8S+IN.yaml b/device-types/MikroTik/CRS309-1G-8S+IN.yaml
index b58dc544..5d3f00a5 100644
--- a/device-types/MikroTik/CRS309-1G-8S+IN.yaml
+++ b/device-types/MikroTik/CRS309-1G-8S+IN.yaml
@@ -2,27 +2,44 @@
 manufacturer: MikroTik
 model: CRS309-1G-8S+IN
 slug: crs309-1g-8splus-in
+part_number: CRS309-1G-8S+
 is_full_depth: false
 u_height: 1
 interfaces:
   - name: sfp-sfpplus1
+    label: SFP+ 1
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus2
+    label: SFP+ 2
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus3
+    label: SFP+ 3
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus4
+    label: SFP+ 4
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus5
+    label: SFP+ 5
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus6
+    label: SFP+ 6
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus7
+    label: SFP+ 7
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus8
+    label: SFP+ 8
     type: 10gbase-x-sfpp
   - name: ether1
+    label: POE/BOOT
     type: 1000base-t
+power-ports:
+  - name: psu1
+    label: DC 12-57V
+    type: dc-terminal
+    maximum_draw: 23
 console-ports:
   - name: serial0
+    label: CONSOLE
     type: rj-45
+comments: Desktop switch with one Gigabit Ethernet port and eight SFP+ 10Gbps ports.
diff --git a/device-types/MikroTik/CRS317-1G-16S+RM.yaml b/device-types/MikroTik/CRS317-1G-16S+RM.yaml
index 35513967..1a5a919f 100644
--- a/device-types/MikroTik/CRS317-1G-16S+RM.yaml
+++ b/device-types/MikroTik/CRS317-1G-16S+RM.yaml
@@ -2,50 +2,72 @@
 manufacturer: MikroTik
 model: CRS317-1G-16S+RM
 slug: crs317-1g-16splus-rm
+part_number: CRS317-1G-16S+
 is_full_depth: false
 u_height: 1
 interfaces:
   - name: sfp-sfpplus1
+    label: SFP+ 1
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus2
+    label: SFP+ 2
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus3
+    label: SFP+ 3
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus4
+    label: SFP+ 4
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus5
+    label: SFP+ 5
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus6
+    label: SFP+ 6
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus7
+    label: SFP+ 7
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus8
+    label: SFP+ 8
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus9
+    label: SFP+ 9
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus10
+    label: SFP+ 10
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus11
+    label: SFP+ 11
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus12
+    label: SFP+ 12
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus13
+    label: SFP+ 13
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus14
+    label: SFP+ 14
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus15
+    label: SFP+ 15
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus16
+    label: SFP+ 16
     type: 10gbase-x-sfpp
   - name: ether1
+    label: ETH/BOOT
     type: 1000base-t
 console-ports:
   - name: serial0
+    label: CONSOLE
     type: rj-45
 power-ports:
   - name: power1
+    label: POWER 1
     type: iec-60320-c14
     maximum_draw: 44
   - name: power2
+    label: POWER 2
     type: iec-60320-c14
     maximum_draw: 44
+comments: Smart Switch, 1 x Gigabit LAN, 16 x SFP+ cages, Dual Core 800MHz CPU, 1GB RAM, 1U rackmount passive cooling case, Dual Power Supplies.
diff --git a/device-types/MikroTik/CRS326-24G-2S+RM.yaml b/device-types/MikroTik/CRS326-24G-2S+RM.yaml
index 231be739..0a02ce53 100644
--- a/device-types/MikroTik/CRS326-24G-2S+RM.yaml
+++ b/device-types/MikroTik/CRS326-24G-2S+RM.yaml
@@ -2,61 +2,95 @@
 manufacturer: MikroTik
 model: CRS326-24G-2S+RM
 slug: crs326-24g-2splus-rm
+part_number: CRS326-24G-2S
 is_full_depth: false
 u_height: 1
 interfaces:
   - name: ether1
+    label: "1"
     type: 1000base-t
   - name: ether2
+    label: "2"
     type: 1000base-t
   - name: ether3
+    label: "3"
     type: 1000base-t
   - name: ether4
+    label: "4"
     type: 1000base-t
   - name: ether5
+    label: "5"
     type: 1000base-t
   - name: ether6
+    label: "6"
     type: 1000base-t
   - name: ether7
+    label: "7"
     type: 1000base-t
   - name: ether8
+    label: "8"
     type: 1000base-t
   - name: ether9
+    label: "9"
     type: 1000base-t
   - name: ether10
+    label: "10"
     type: 1000base-t
   - name: ether11
+    label: "11"
     type: 1000base-t
   - name: ether12
+    label: "12"
     type: 1000base-t
   - name: ether13
+    label: "13"
     type: 1000base-t
   - name: ether14
+    label: "14"
     type: 1000base-t
   - name: ether15
+    label: "15"
     type: 1000base-t
   - name: ether16
+    label: "16"
     type: 1000base-t
   - name: ether17
+    label: "17"
     type: 1000base-t
   - name: ether18
+    label: "18"
     type: 1000base-t
   - name: ether19
+    label: "19"
     type: 1000base-t
   - name: ether20
+    label: "20"
     type: 1000base-t
   - name: ether21
+    label: "21"
     type: 1000base-t
   - name: ether22
+    label: "22"
     type: 1000base-t
   - name: ether23
+    label: "23"
     type: 1000base-t
   - name: ether24
+    label: "24"
     type: 1000base-t
   - name: sfp-sfpplus1
+    label: SFP+ 1
     type: 10gbase-x-sfpp
   - name: sfp-sfpplus2
+    label: SFP+ 2
     type: 10gbase-x-sfpp
+power-ports:
+  - name: psu1
+    label: DC 10-28V
+    type: dc-terminal
+    maximum_draw: 24
 console-ports:
   - name: serial0
+    label: CONSOLE
     type: rj-45
+comments: 24x Gigabit Switch with 2x SFP+ Cages in 1U Rackmount Case
diff --git a/device-types/MikroTik/RB941-2nD.yaml b/device-types/MikroTik/RB941-2nD.yaml
new file mode 100644
index 00000000..9780a68d
--- /dev/null
+++ b/device-types/MikroTik/RB941-2nD.yaml
@@ -0,0 +1,26 @@
+---
+manufacturer: MikroTik
+model: hAP lite
+slug: rb941-2nd
+part_number: RB941-2nD
+is_full_depth: false
+u_height: 0
+power-ports:
+  - name: psu1
+    label: Power
+    type: usb-micro-b
+    maximum_draw: 4
+interfaces:
+  - name: ether1
+    label: "1"
+    type: 1000base-t
+  - name: ether2
+    label: "2"
+    type: 1000base-t
+  - name: ether3
+    label: "3"
+    type: 1000base-t
+  - name: ether4
+    label: "4"
+    type: 1000base-t
+comments: Low cost home wireless AP with dual chain 2.4GHz wireless, powered by USB.