diff --git a/device-types/Cisco/N9K-C93360YC-FX2.yml b/device-types/Cisco/N9K-C93360YC-FX2.yml
new file mode 100644
index 000000000..8998cc3ac
--- /dev/null
+++ b/device-types/Cisco/N9K-C93360YC-FX2.yml
@@ -0,0 +1,252 @@
+---
+manufacturer: Cisco
+model: Nexus 93360YC-FX2
+slug: cisco-n9k-c93360yc-fx2
+part_number: N9K-C93360YC-FX2
+front_image: true
+rear_image: true
+u_height: 2
+is_full_depth: true
+weight: 12.4
+weight_unit: kg
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+interfaces:
+  - name: Ethernet1/1
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/2
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/3
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/4
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/5
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/6
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/7
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/8
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/9
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/10
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/11
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/12
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/13
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/14
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/15
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/16
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/17
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/18
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/19
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/20
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/21
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/22
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/23
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/24
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/25
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/26
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/27
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/28
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/29
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/30
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/31
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/32
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/33
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/34
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/35
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/36
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/37
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/38
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/39
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/40
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/41
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/42
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/43
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/44
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/45
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/46
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/47
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/48
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/49
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/50
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/51
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/52
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/53
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/54
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/55
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/56
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/57
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/58
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/59
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/60
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/61
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/62
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/63
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/64
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/65
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/66
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/67
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/68
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/69
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/70
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/71
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/72
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/73
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/74
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/75
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/76
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/77
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/78
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/79
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/80
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/81
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/82
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/83
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/84
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/85
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/86
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/87
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/88
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/89
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/90
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/91
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/92
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/93
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/94
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/95
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/96
+    type: 25gbase-x-sfp28
+  - name: Ethernet1/97
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/98
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/99
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/100
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/101
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/102
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/103
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/104
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/105
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/106
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/107
+    type: 100gbase-x-qsfp28
+  - name: Ethernet1/108
+    type: 100gbase-x-qsfp28
+  - name: mgmt0
+    type: 1000base-t
+    mgmt_only: true
+  - name: mgmt1
+    type: 1000base-x-sfp
+    mgmt_only: true
+module-bays:
+  - name: PS1
+    label: Power Supply 1
+    position: '1'
+  - name: PS2
+    label: Power Supply 2
+    position: '2'
+  - name: Fan 1
+    position: '1'
+  - name: Fan 2
+    position: '2'
+  - name: Fan 3
+    position: '3'
diff --git a/device-types/Cisco/SMA-M395.yaml b/device-types/Cisco/SMA-M395.yaml
new file mode 100644
index 000000000..2acb9e32c
--- /dev/null
+++ b/device-types/Cisco/SMA-M395.yaml
@@ -0,0 +1,36 @@
+---
+manufacturer: Cisco
+model: SMA M395
+slug: cisco-sma-m395
+part_number: SMA-M395
+u_height: 1
+is_full_depth: true
+airflow: front-to-rear
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: RPC
+    type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
+interfaces:
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: DATA1
+    type: 1000base-t
+  - name: DATA2
+    type: 1000base-t
+  - name: DATA3
+    type: 1000base-t
+  - name: DATA4
+    type: 1000base-t
+  - name: DATA5
+    type: 1000base-t
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
diff --git a/device-types/Cisco/WSA-S195.yaml b/device-types/Cisco/WSA-S195.yaml
new file mode 100644
index 000000000..8be6a4920
--- /dev/null
+++ b/device-types/Cisco/WSA-S195.yaml
@@ -0,0 +1,35 @@
+---
+manufacturer: Cisco
+model: WSA S195
+slug: cisco-wsa-s195
+part_number: WSA-S195
+u_height: 1
+is_full_depth: true
+airflow: front-to-rear
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: RPC
+    type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: usb2
+    type: usb-a
+interfaces:
+  - name: M1
+    type: 1000base-t
+  - name: M2
+    type: 1000base-t
+  - name: P1
+    type: 1000base-t
+  - name: P2
+    type: 1000base-t
+  - name: T1
+    type: 1000base-t
+  - name: T2
+    type: 1000base-t
+module-bays:
+  - name: PSU1
+    position: '1'
+  - name: PSU2
+    position: '2'
diff --git a/device-types/F5/BIG-IP-i7800.yml b/device-types/F5/BIG-IP-i7800.yml
new file mode 100644
index 000000000..880020ac4
--- /dev/null
+++ b/device-types/F5/BIG-IP-i7800.yml
@@ -0,0 +1,52 @@
+---
+manufacturer: F5
+model: BIG-IP i7800
+slug: f5-big-ip-i7800
+part_number: i7800
+u_height: 1
+is_full_depth: true
+weight: 30
+weight_unit: lb
+airflow: front-to-rear
+front_image: true
+rear_image: true
+console-ports:
+  - name: Console
+    type: rj-45
+  - name: usb1
+    type: usb-a
+  - name: Failover
+    type: rj-45
+interfaces:
+  - name: mgmt
+    type: 1000base-t
+    mgmt_only: true
+  - name: '1.1'
+    type: 10gbase-x-sfpp
+  - name: '1.2'
+    type: 10gbase-x-sfpp
+  - name: '1.3'
+    type: 10gbase-x-sfpp
+  - name: '1.4'
+    type: 10gbase-x-sfpp
+  - name: '2.1'
+    type: 10gbase-x-sfpp
+  - name: '2.2'
+    type: 10gbase-x-sfpp
+  - name: '2.3'
+    type: 10gbase-x-sfpp
+  - name: '2.4'
+    type: 10gbase-x-sfpp
+  - name: '3.0'
+    type: 40gbase-x-qsfpp
+  - name: '4.0'
+    type: 40gbase-x-qsfpp
+  - name: '5.0'
+    type: 40gbase-x-qsfpp
+  - name: '6.0'
+    type: 40gbase-x-qsfpp
+module-bays:
+  - name: psu1
+    position: '1'
+  - name: psu2
+    position: '2'
diff --git a/elevation-images/Cisco/cisco-n9k-c93360yc-fx2.front.png b/elevation-images/Cisco/cisco-n9k-c93360yc-fx2.front.png
new file mode 100644
index 000000000..c89df1315
Binary files /dev/null and b/elevation-images/Cisco/cisco-n9k-c93360yc-fx2.front.png differ
diff --git a/elevation-images/Cisco/cisco-n9k-c93360yc-fx2.rear.png b/elevation-images/Cisco/cisco-n9k-c93360yc-fx2.rear.png
new file mode 100644
index 000000000..e0c704d7c
Binary files /dev/null and b/elevation-images/Cisco/cisco-n9k-c93360yc-fx2.rear.png differ
diff --git a/elevation-images/F5/f5-big-ip-i7800.front.png b/elevation-images/F5/f5-big-ip-i7800.front.png
new file mode 100644
index 000000000..8fe9133f1
Binary files /dev/null and b/elevation-images/F5/f5-big-ip-i7800.front.png differ
diff --git a/elevation-images/F5/f5-big-ip-i7800.rear.png b/elevation-images/F5/f5-big-ip-i7800.rear.png
new file mode 100644
index 000000000..ee55ce728
Binary files /dev/null and b/elevation-images/F5/f5-big-ip-i7800.rear.png differ