lots of changes
diff --git a/xml/control.xml b/xml/control.xml
index 844cf5f..b23cf1c 100644
--- a/xml/control.xml
+++ b/xml/control.xml
@@ -1,9 +1,7 @@
 <node>
 	<interface name="org.openbmc.Control">
-                <method name="setPollInterval">
-                        <arg name="poll_interval" type="i" direction="in"/>
-                </method>
-		<property name="poll_interval" type="i" access="read"/>
+		<method name="init"/>
+		<property name="poll_interval" type="i" access="readwrite"/>
 		<property name="heatbeat" type="i" access="read"/>
 		<signal name="Heartbeat">
                         <arg name="bus_name" type="s"/>
diff --git a/xml/sensor.xml b/xml/sensor.xml
index 2d6ccdb..463264c 100644
--- a/xml/sensor.xml
+++ b/xml/sensor.xml
@@ -8,10 +8,11 @@
 			<arg name="value" type="v" direction="in"/>

 		</method>

 

-                <property name="value" type="v" access="readwrite"/>

+                <property name="value" type="v" access="read"/>

 		<property name="units" type="s" access="read"/>

-		<property name="poll_interval" type="i" access="read"/>

+		<property name="poll_interval" type="i" access="readwrite"/>

 		<property name="heatbeat" type="i" access="read"/>

+		<property name="settable" type="b" access="read"/>

 

 		<signal name="Changed">

 			<arg name="value" type="v"/>

@@ -40,5 +41,12 @@
 		<property name="dev_path" type="s" access="readwrite"/>

 		<property name="address"  type="s" access="readwrite"/>

 	</interface>

+	<interface name="org.openbmc.SensorMatch">

+		<property name="match_value" type="v" access="read"/>

+		<property name="state" type="y" access="read"/>

+		<signal name="SensorMatch">

+			<arg name="state" type="y"/>

+		</signal>

+	</interface>

 

 </node>

diff --git a/xml/watchdog.xml b/xml/watchdog.xml
index 90138ba..7889b43 100644
--- a/xml/watchdog.xml
+++ b/xml/watchdog.xml
@@ -4,9 +4,12 @@
 		@short_description: 

 	-->	

 	<interface name="org.openbmc.Watchdog">

-		<method name="update"/>

 		<method name="start"/>

+		<method name="poke"/>

 		<method name="stop"/>

+		<property name="watchdog" type="i" access="readwrite"/>

+		<property name="poll_interval" type="i" access="readwrite"/>

+		<signal name="WatchdogError"/>

 	</interface>

 </node>