Updated SensorTypes.xsd and models