diff --git a/devices/psmart-t400-16a-plug-with-energy-monitoring.json b/devices/psmart-t400-16a-plug-with-energy-monitoring.json
new file mode 100644
index 00000000..93470e27
--- /dev/null
+++ b/devices/psmart-t400-16a-plug-with-energy-monitoring.json
@@ -0,0 +1,158 @@
+{
+	"manufacturer": "PSMART",
+	"name": "T400 16A Plug with Energy Monitoring",
+	"key": "x1rrhj1eyntqnxtx",
+	"ap_ssid": "SmartLife",
+	"github_issues": [
+		587
+	],
+	"image_urls": [
+		"psmart-t400-16a-plug-with-energy-monitoring.jpg"
+	],
+	"profiles": [
+		"ua-app-1.0.13-sdk-2.3.3-40.00"
+	],
+	"schemas": {
+		"000004k53u": [
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 1
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 86400,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 9
+			},
+			{
+				"trigger": "direct",
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"min": 0,
+					"max": 50000,
+					"scale": 3,
+					"step": 100,
+					"type": "value"
+				},
+				"id": 17
+			},
+			{
+				"type": "obj",
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 80000,
+					"scale": 0,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 18
+			},
+			{
+				"type": "obj",
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 200000,
+					"scale": 1,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 19
+			},
+			{
+				"type": "obj",
+				"mode": "ro",
+				"property": {
+					"min": 0,
+					"max": 5000,
+					"scale": 1,
+					"step": 1,
+					"type": "value"
+				},
+				"id": 20
+			},
+			{
+				"mode": "ro",
+				"property": {
+					"type": "bitmap",
+					"maxlen": 6
+				},
+				"id": 26,
+				"type": "obj"
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"range": [
+						"off",
+						"on",
+						"memory"
+					],
+					"type": "enum"
+				},
+				"id": 38
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"range": [
+						"relay",
+						"pos",
+						"none"
+					],
+					"type": "enum"
+				},
+				"id": 39
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "bool"
+				},
+				"id": 40
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "string",
+					"maxlen": 255
+				},
+				"id": 41
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "string",
+					"maxlen": 255
+				},
+				"id": 42
+			},
+			{
+				"type": "obj",
+				"mode": "rw",
+				"property": {
+					"type": "string",
+					"maxlen": 255
+				},
+				"id": 43
+			}
+		]
+	}
+}
diff --git a/images/psmart-t400-16a-plug-with-energy-monitoring.jpg b/images/psmart-t400-16a-plug-with-energy-monitoring.jpg
new file mode 100644
index 00000000..a9aa48e7
Binary files /dev/null and b/images/psmart-t400-16a-plug-with-energy-monitoring.jpg differ
diff --git a/profiles/ua-app-1.0.13-sdk-2.3.3-40.00.json b/profiles/ua-app-1.0.13-sdk-2.3.3-40.00.json
new file mode 100644
index 00000000..8f80f66a
--- /dev/null
+++ b/profiles/ua-app-1.0.13-sdk-2.3.3-40.00.json
@@ -0,0 +1,17 @@
+{
+	"name": "1.0.13 - BK7231N",
+	"sub_name": "ua_app",
+	"type": "CLASSIC",
+	"icon": "memory",
+	"firmware": {
+		"chip": "BK7231N",
+		"name": "ua_app",
+		"version": "1.0.13",
+		"sdk": "2.3.3-40.00"
+	},
+	"data": {
+		"address_finish": "0x1B59B",
+		"address_ssid": "0xBDA1D",
+		"address_ssid_padding": 4
+	}
+}