diff --git a/devices/tuya-generic-ems-63a-230v-switch-with-energy-monitoring-v2.1.6.json b/devices/tuya-generic-ems-63a-230v-switch-with-energy-monitoring-v2.1.6.json
new file mode 100644
index 00000000..b83547c6
--- /dev/null
+++ b/devices/tuya-generic-ems-63a-230v-switch-with-energy-monitoring-v2.1.6.json
@@ -0,0 +1,193 @@
+{
+	"manufacturer": "Tuya Generic",
+	"name": "EMS-63A-230V Switch with Energy Monitoring v2.1.6",
+	"key": "kzy0cr7cs3nkpumw",
+	"ap_ssid": "SmartLife",
+	"github_issues": [
+		683
+	],
+	"image_urls": [
+		"tuya-generic-ems-63a-230v-switch-with-energy-monitoring-v2.1.6.jpg"
+	],
+	"profiles": [
+		"bk7231n-common-user-config-ty-2.1.6-sdk-2.3.3-40.00"
+	],
+	"schemas": {
+		"000004uq3k": [
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 99999999,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 1,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"id": 6,
+				"type": "raw"
+			},
+			{
+				"mode": "ro",
+				"id": 7,
+				"type": "raw"
+			},
+			{
+				"mode": "ro",
+				"id": 8,
+				"type": "raw"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"type": "bitmap",
+					"maxlen": 17
+				},
+				"id": 9,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 11,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 12,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 99999999,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 13,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 999999,
+					"scale": 2,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 14,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 16,
+				"type": "obj"
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"type": "string",
+					"maxlen": 255
+				},
+				"id": 19,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 230,
+					"max": 300,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 101,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 90,
+					"max": 210,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 102,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 1,
+					"max": 63,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 103,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"min": 10,
+					"max": 100,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 104,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 105,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 106,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 115,
+				"type": "obj"
+			},
+			{
+				"mode": "rw",
+				"property": {
+					"type": "string",
+					"maxlen": 255
+				},
+				"id": 116,
+				"type": "obj"
+			}
+		]
+	}
+}
diff --git a/images/tuya-generic-ems-63a-230v-switch-with-energy-monitoring-v2.1.6.jpg b/images/tuya-generic-ems-63a-230v-switch-with-energy-monitoring-v2.1.6.jpg
new file mode 100644
index 00000000..70e6decd
Binary files /dev/null and b/images/tuya-generic-ems-63a-230v-switch-with-energy-monitoring-v2.1.6.jpg differ