diff --git a/configure.ac b/configure.ac
index d6be635..b711d85 100644
--- a/configure.ac
+++ b/configure.ac
@@ -19,8 +19,6 @@ AS_IF([test "x$enable_acs" = "xno"], [AC_DEFINE(ACS_MULTI)])
 AC_ARG_ENABLE(datamodel, [AS_HELP_STRING([--enable-datamodel],
 	[specify which Data Model will be used; (default --enable-datamodel=tr098]))],,)
 
-#AS_IF([test "x$enable_datamodel" = "xtr098"], [AC_DEFINE(DATAMODEL_TR098)])
-#AS_IF([test "x$enable_datamodel" = "xtr181"], [AC_DEFINE(DATAMODEL_TR181)])
 AM_CONDITIONAL([DATAMODEL_TR098], [test "x$enable_datamodel" = "xtr098" ])
 AM_CONDITIONAL([DATAMODEL_TR181], [test "x$enable_datamodel" = "xtr181" ])
 
diff --git a/dm/dmtree/common/deviceinfo.c b/dm/dmtree/common/deviceinfo.c
index 17d6ad2..2ea24ea 100644
--- a/dm/dmtree/common/deviceinfo.c
+++ b/dm/dmtree/common/deviceinfo.c
@@ -240,6 +240,54 @@ int set_device_catvenabled(char *refparam, struct dmctx *ctx, int action, char *
 	return 0;
 }
 
+int get_catv_optical_input_level(char *refparam, struct dmctx *ctx, char **value)
+{
+	json_object *res;
+	char *str;
+	*value = "";
+	dmubus_call("catv", "vpd", UBUS_ARGS{}, 0, &res);
+	if (!res)
+		return 0;
+	json_select(res, "VPD", -1, NULL, value, NULL);
+	return 0;
+}
+
+int get_catv_rf_output_level(char *refparam, struct dmctx *ctx, char **value)
+{
+	json_object *res;
+	char *str;
+	*value = "";
+	dmubus_call("catv", "rf", UBUS_ARGS{}, 0, &res);
+	if (!res)
+		return 0;
+	json_select(res, "RF", -1, NULL, value, NULL);
+	return 0;
+}
+
+int get_catv_temperature(char *refparam, struct dmctx *ctx, char **value)
+{
+	json_object *res;
+	char *str;
+	*value = "";
+	dmubus_call("catv", "temp", UBUS_ARGS{}, 0, &res);
+	if (!res)
+		return 0;
+	json_select(res, "Temperature", -1, NULL, value, NULL);
+	return 0;
+}
+
+int get_catv_voltage(char *refparam, struct dmctx *ctx, char **value)
+{
+	json_object *res;
+	char *str;
+	*value = "";
+	dmubus_call("catv", "vcc", UBUS_ARGS{}, 0, &res);
+	if (!res)
+		return 0;
+	json_select(res, "VCC", -1, NULL, value, NULL);
+	return 0;
+}
+
 int entry_method_root_DeviceInfo(struct dmctx *ctx)
 {
 	IF_MATCH(ctx, DMROOT"DeviceInfo.") {
@@ -257,6 +305,12 @@ int entry_method_root_DeviceInfo(struct dmctx *ctx)
 		DMPARAM("ProvisioningCode", ctx, "1", get_device_provisioningcode, set_device_provisioningcode, NULL, 1, 0, 2, NULL);
 		DMPARAM("X_INTENO_SE_BaseMacAddr", ctx, "0", get_base_mac_addr, NULL, NULL, 0, 1, UNDEF, NULL);
 		DMPARAM("X_INTENO_SE_CATVEnabled", ctx, "1", get_catv_enabled, set_device_catvenabled, NULL, 0, 1, UNDEF, NULL);
+		DMOBJECT(DMROOT"DeviceInfo.X_INTENO_SE_CATV.", ctx, "0", 0, NULL, NULL, NULL);
+		DMPARAM("Enabled", ctx, "1", get_catv_enabled, set_device_catvenabled, NULL, 0, 1, UNDEF, NULL);
+		DMPARAM("OpticalInputLevel", ctx, "0", get_catv_optical_input_level, NULL, NULL, 0, 1, UNDEF, NULL);
+		DMPARAM("RFOutputLevel", ctx, "0", get_catv_rf_output_level, NULL, NULL, 0, 1, UNDEF, NULL);
+		DMPARAM("Temperature", ctx, "0", get_catv_temperature, NULL, NULL, 0, 1, UNDEF, NULL);
+		DMPARAM("Voltage", ctx, "0", get_catv_voltage, NULL, NULL, 0, 1, UNDEF, NULL);
 		return 0;
 	}
 	return FAULT_9005;