diff --git a/xml/fru.xml b/xml/fru.xml
index 8d1f881..722e46d 100644
--- a/xml/fru.xml
+++ b/xml/fru.xml
@@ -1,5 +1,6 @@
 <node>
 	<interface name="org.openbmc.Fru">
+		<method name="init"/>
 		<property name="label"        type="s" access="readwrite"/>
 		<property name="location"     type="s" access="readwrite"/>
 		<property name="state"        type="y" access="readwrite"/>
@@ -14,6 +15,9 @@
 		<signal name="StateChanged"/>
 		<signal name="UnrecoverableError"/>
 		<signal name="RecoverableError"/>
+		<signal name="CacheMe">
+			<arg name="busname" type="s"/>
+		</signal>
 	</interface>
 	<interface name="org.openbmc.Fru.Fan">
 		<method name="setCoolingZone">
@@ -25,14 +29,17 @@
 		<method name="setSpeed">
 			<arg name="speed" type="i" direction="in"/>
 		</method>
-		<method name="setConfigData">
-			<arg name="pwm_num" type="i" direction="in"/>
-		</method>
-		<property name="speed" type="i" access="read"/>
-		<property name="cooling_zone" type="i" access="read"/>
+		<property name="speed" type="i" access="readwrite"/>
+		<property name="cooling_zone" type="i" access="readwrite"/>
+		<property name="pwm_num"  type="i" access="readwrite"/>
 		<signal name="SpeedChanged">
 			<arg name="speed" type="i"/>
 		</signal>
 		<signal name="TachError"/>
 	</interface>
+	<interface name="org.openbmc.Fru.Eeprom">
+		<property name="i2c_dev_path" type="s" access="readwrite"/>
+		<property name="i2c_address" type="s" access="readwrite"/>
+		<signal name="ReadDone"/>
+	</interface>
 </node>
diff --git a/xml/sensor2.xml b/xml/sensor.xml
similarity index 87%
rename from xml/sensor2.xml
rename to xml/sensor.xml
index 1823743..a6d0a9b 100644
--- a/xml/sensor2.xml
+++ b/xml/sensor.xml
@@ -13,20 +13,15 @@
 		<method name="setPollInterval">
 			<arg name="poll_interval" type="i" direction="in"/>
 		</method>
-		<method name="setConfigData">
-			<arg name="config" type="as" direction="in"/>
-		</method>
 
-                <property name="value" type="i" access="read"/>
+                <property name="value" type="i" access="readwrite"/>
 		<property name="units" type="s" access="read"/>
-
 		<property name="poll_interval" type="i" access="read"/>
-		<property name="config_data" type="as" access="read"/>
-
 		<property name="heatbeat" type="i" access="read"/>
 
 		<signal name="Changed">
 			<arg name="value" type="i"/>
+			<arg name="units" type="s"/>
 		</signal>
 		<signal name="Heartbeat">
 			<arg name="bus_name" type="s"/>
@@ -64,5 +59,11 @@
 
 		<signal name="Warning"/>
 		<signal name="Critical"/>
+		<signal name="Normal"/>
 	</interface>
+	<interface name="org.openbmc.SensorI2c">
+		<property name="dev_path" type="s" access="readwrite"/>
+		<property name="address"  type="s" access="readwrite"/>
+	</interface>
+
 </node>