diff --git a/device-types/Cisco/ws-c3650-48td-s.yaml b/device-types/Cisco/ws-c3650-48td-s.yaml
new file mode 100644
index 00000000..1d4760ae
--- /dev/null
+++ b/device-types/Cisco/ws-c3650-48td-s.yaml
@@ -0,0 +1,120 @@
+manufacturer: Cisco
+model: Catalyst 3650-48TD-S
+slug: ws-c3650-48td-s
+part_number: WS-C3650-48TD-S
+is_full_depth: false
+u_height: 1
+interfaces:
+  - name: GigabitEthernet0/0
+    type: 1000base-t
+    mgmt_only: true
+  - name: GigabitEthernet1/0/1
+    type: 1000base-t
+  - name: GigabitEthernet1/0/2
+    type: 1000base-t
+  - name: GigabitEthernet1/0/3
+    type: 1000base-t
+  - name: GigabitEthernet1/0/4
+    type: 1000base-t
+  - name: GigabitEthernet1/0/5
+    type: 1000base-t
+  - name: GigabitEthernet1/0/6
+    type: 1000base-t
+  - name: GigabitEthernet1/0/7
+    type: 1000base-t
+  - name: GigabitEthernet1/0/8
+    type: 1000base-t
+  - name: GigabitEthernet1/0/9
+    type: 1000base-t
+  - name: GigabitEthernet1/0/10
+    type: 1000base-t
+  - name: GigabitEthernet1/0/11
+    type: 1000base-t
+  - name: GigabitEthernet1/0/12
+    type: 1000base-t
+  - name: GigabitEthernet1/0/13
+    type: 1000base-t
+  - name: GigabitEthernet1/0/14
+    type: 1000base-t
+  - name: GigabitEthernet1/0/15
+    type: 1000base-t
+  - name: GigabitEthernet1/0/16
+    type: 1000base-t
+  - name: GigabitEthernet1/0/17
+    type: 1000base-t
+  - name: GigabitEthernet1/0/18
+    type: 1000base-t
+  - name: GigabitEthernet1/0/19
+    type: 1000base-t
+  - name: GigabitEthernet1/0/20
+    type: 1000base-t
+  - name: GigabitEthernet1/0/21
+    type: 1000base-t
+  - name: GigabitEthernet1/0/22
+    type: 1000base-t
+  - name: GigabitEthernet1/0/23
+    type: 1000base-t
+  - name: GigabitEthernet1/0/24
+    type: 1000base-t
+  - name: GigabitEthernet1/0/25
+    type: 1000base-t
+  - name: GigabitEthernet1/0/26
+    type: 1000base-t
+  - name: GigabitEthernet1/0/27
+    type: 1000base-t
+  - name: GigabitEthernet1/0/28
+    type: 1000base-t
+  - name: GigabitEthernet1/0/29
+    type: 1000base-t
+  - name: GigabitEthernet1/0/30
+    type: 1000base-t
+  - name: GigabitEthernet1/0/31
+    type: 1000base-t
+  - name: GigabitEthernet1/0/32
+    type: 1000base-t
+  - name: GigabitEthernet1/0/33
+    type: 1000base-t
+  - name: GigabitEthernet1/0/34
+    type: 1000base-t
+  - name: GigabitEthernet1/0/35
+    type: 1000base-t
+  - name: GigabitEthernet1/0/36
+    type: 1000base-t
+  - name: GigabitEthernet1/0/37
+    type: 1000base-t
+  - name: GigabitEthernet1/0/38
+    type: 1000base-t
+  - name: GigabitEthernet1/0/39
+    type: 1000base-t
+  - name: GigabitEthernet1/0/40
+    type: 1000base-t
+  - name: GigabitEthernet1/0/41
+    type: 1000base-t
+  - name: GigabitEthernet1/0/42
+    type: 1000base-t
+  - name: GigabitEthernet1/0/43
+    type: 1000base-t
+  - name: GigabitEthernet1/0/44
+    type: 1000base-t
+  - name: GigabitEthernet1/0/45
+    type: 1000base-t
+  - name: GigabitEthernet1/0/46
+    type: 1000base-t
+  - name: GigabitEthernet1/0/47
+    type: 1000base-t
+  - name: GigabitEthernet1/0/48
+    type: 1000base-t
+  - name: GigabitEthernet1/1/1
+    type: 1000base-x-sfp
+  - name: GigabitEthernet1/1/2
+    type: 1000base-x-sfp
+  - name: TenGigabitEthernet1/1/3
+    type: 10gbase-x-sfpp
+  - name: TenGigabitEthernet1/1/4
+    type: 10gbase-x-sfpp
+console-ports:
+  - name: con0
+    type: rj-45
+power-ports:
+  - name: PSU0
+    type: iec-60320-c14
diff --git a/device-types/Juniper/EX4300-48MP.yaml b/device-types/Juniper/EX4300-48MP.yaml
index 8e11697d..5974061b 100644
--- a/device-types/Juniper/EX4300-48MP.yaml
+++ b/device-types/Juniper/EX4300-48MP.yaml
@@ -1,167 +1,118 @@
 manufacturer: Juniper
 model: EX4300-48MP
 slug: ex4300-48mp
-part_number: ''
+part_number: EX4300-48MP
 u_height: 1
 is_full_depth: true
-subdevice_role: ''
-comments: ''
+interfaces:
+- name: me0
+  type: 1000base-t
+  mgmt_only: true
+- name: ge-0/0/0
+  type: 1000base-t
+- name: ge-0/0/1
+  type: 1000base-t
+- name: ge-0/0/2
+  type: 1000base-t
+- name: ge-0/0/3
+  type: 1000base-t
+- name: ge-0/0/4
+  type: 1000base-t
+- name: ge-0/0/5
+  type: 1000base-t
+- name: ge-0/0/6
+  type: 1000base-t
+- name: ge-0/0/7
+  type: 1000base-t
+- name: ge-0/0/8
+  type: 1000base-t
+- name: ge-0/0/9
+  type: 1000base-t
+- name: ge-0/0/10
+  type: 1000base-t
+- name: ge-0/0/11
+  type: 1000base-t
+- name: ge-0/0/12
+  type: 1000base-t
+- name: ge-0/0/13
+  type: 1000base-t
+- name: ge-0/0/14
+  type: 1000base-t
+- name: ge-0/0/15
+  type: 1000base-t
+- name: ge-0/0/16
+  type: 1000base-t
+- name: ge-0/0/17
+  type: 1000base-t
+- name: ge-0/0/18
+  type: 1000base-t
+- name: ge-0/0/19
+  type: 1000base-t
+- name: ge-0/0/20
+  type: 1000base-t
+- name: ge-0/0/21
+  type: 1000base-t
+- name: ge-0/0/22
+  type: 1000base-t
+- name: ge-0/0/23
+  type: 1000base-t
+- name: mge-0/0/24
+  type: 10gbase-t
+- name: mge-0/0/25
+  type: 10gbase-t
+- name: mge-0/0/26
+  type: 10gbase-t
+- name: mge-0/0/27
+  type: 10gbase-t
+- name: mge-0/0/28
+  type: 10gbase-t
+- name: mge-0/0/29
+  type: 10gbase-t
+- name: mge-0/0/30
+  type: 10gbase-t
+- name: mge-0/0/31
+  type: 10gbase-t
+- name: mge-0/0/32
+  type: 10gbase-t
+- name: mge-0/0/33
+  type: 10gbase-t
+- name: mge-0/0/34
+  type: 10gbase-t
+- name: mge-0/0/35
+  type: 10gbase-t
+- name: mge-0/0/36
+  type: 10gbase-t
+- name: mge-0/0/37
+  type: 10gbase-t
+- name: mge-0/0/38
+  type: 10gbase-t
+- name: mge-0/0/39
+  type: 10gbase-t
+- name: mge-0/0/40
+  type: 10gbase-t
+- name: mge-0/0/41
+  type: 10gbase-t
+- name: mge-0/0/42
+  type: 10gbase-t
+- name: mge-0/0/43
+  type: 10gbase-t
+- name: mge-0/0/44
+  type: 10gbase-t
+- name: mge-0/0/45
+  type: 10gbase-t
+- name: mge-0/0/46
+  type: 10gbase-t
+- name: mge-0/0/47
+  type: 10gbase-t
 console-ports:
 - name: Console
   type: rj-45
 - name: Front Console
-  type: usb-micro-a
+  type: usb-mini-b
 power-ports:
 - name: PSU0
   type: iec-60320-c14
-  maximum_draw: 1100
-  allocated_draw: null
+  maximum_draw: 1400
 - name: PSU1
   type: iec-60320-c14
-  maximum_draw: 1100
-  allocated_draw: null
-interfaces:
-- name: ge-0/0/0
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/1
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/2
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/3
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/4
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/5
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/6
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/7
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/8
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/9
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/10
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/11
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/12
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/13
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/14
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/15
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/16
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/17
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/18
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/19
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/20
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/21
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/22
-  type: 1000base-t
-  mgmt_only: false
-- name: ge-0/0/23
-  type: 1000base-t
-  mgmt_only: false
-- name: mge-0/0/24
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/25
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/26
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/27
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/28
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/29
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/30
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/31
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/32
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/33
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/34
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/35
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/36
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/37
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/38
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/39
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/40
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/41
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/42
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/43
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/44
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/45
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/46
-  type: 10gbase-t
-  mgmt_only: false
-- name: mge-0/0/47
-  type: 10gbase-t
-  mgmt_only: false
+  maximum_draw: 1400
\ No newline at end of file