diff --git a/xml/host_control.xml b/xml/host_control.xml
deleted file mode 100644
index d9d5b23..0000000
--- a/xml/host_control.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<node>
-	<interface name="org.openbmc.HostControl">
-		<method name="boot"/>
-		<method name="shutdown"/>
-		<method name="reboot"/>
-		<signal name="Booted"/>
-	</interface>	
-</node>
diff --git a/xml/power_control.xml b/xml/power_control.xml
index a382f11..08cbccb 100644
--- a/xml/power_control.xml
+++ b/xml/power_control.xml
@@ -1,5 +1,5 @@
 <node>
-	<interface name="org.openbmc.PowerControl">
+	<interface name="org.openbmc.control.Power">
 		<method name="setPowerState">
 			<arg name="state" type="i" direction="in"/>
 		</method>
@@ -8,7 +8,7 @@
 		</method>
 		<signal name="PowerGood">
 		</signal>
-		<signal name="PowerLost"/>
+		<signal name="PowerLost">
 		</signal>
 		<property name="pgood" type="i" access="read"/>
 		<property name="state" type="i" access="read"/>
diff --git a/xml/sensor.xml b/xml/sensor.xml
index 5ff66e7..40bf73d 100644
--- a/xml/sensor.xml
+++ b/xml/sensor.xml
@@ -7,20 +7,40 @@
 		<method name="getUnits">
 			<arg name="units" type="s" direction="out"/>
 		</method>
+		<method name="setThresholds">
+			<arg name="lower_critical" type="i" direction="in"/>
+			<arg name="lower_warning"  type="i" direction="in"/>
+			<arg name="upper_warning"  type="i" direction="in"/>
+			<arg name="upper_critical" type="i" direction="in"/>
+		</method>
 		<method name="setPollInterval">
 			<arg name="poll_interval" type="i" direction="in"/>
 		</method>
 		<method name="setConfigData">
 			<arg name="config" type="as" direction="in"/>
 		</method>
+		<method name="getThresholdState">
+			<arg name="threshold_state" type="i" direction="out"/>
+		</method>
+
                 <property name="value" type="i" access="read"/>
 		<property name="units" type="s" access="read"/>
+
+		<property name="threshold_lower_critical" type="i" access="read"/>
+		<property name="threshold_lower_warning"  type="i" access="read"/>
+		<property name="threshold_upper_warning"  type="i" access="read"/>
+		<property name="threshold_upper_critical" type="i" access="read"/>
+		<property name="threshold_state" type="i" access="read"/>
+
 		<property name="poll_interval" type="i" access="read"/>
 		<property name="config_data" type="as" access="read"/>
 		<property name="changed_tolerance" type="i" access="read"/>
+
 		<signal name="Changed">
 			<arg name="value" type="i"/>
 		</signal>
+		<signal name="Warning"/>
+		<signal name="Critical"/>
 	</interface>
         <interface name="org.openbmc.SensorString">
                 <method name="getValue">