Index: spongenet/trunk/spongenet/parse.py
===================================================================
--- spongenet/trunk/spongenet/parse.py (revision 370)
+++ spongenet/trunk/spongenet/parse.py (revision 371)
@@ -199,5 +199,5 @@
     >>> _xmldoc = xmldoc(_xmldoc_path)
     >>> _data = Data(_xmldoc)
-    >>> point = _data.devices[0].sensors[0].points[0]
+    >>> point = _data.devices[0].sensors["SN100-0"].points["Battery Voltage"]
     >>> len(point.keys()) == 8
     True
@@ -243,6 +243,6 @@
     >>> _xmldoc = xmldoc(_xmldoc_path)
     >>> _data = Data(_xmldoc)
-    >>> sensor = _data.devices[0].sensors[0]
-    >>> len(sensor.points)
+    >>> sensor = _data.devices[0].sensors["SN100-0"]
+    >>> len(sensor.points.items())
     3
     >>> len(sensor.keys()) == 9
@@ -278,4 +278,6 @@
                 self.points = [Point(point) for point
                                 in elem.findall(xmlns + "Point")]
+                self.points = dict([(point["descr"], point)
+                                   for point in self.points])
             else:
                 self[tag] = elem.text
@@ -296,5 +298,5 @@
     >>> _data = Data(_xmldoc)
     >>> device = _data.devices[0]
-    >>> len(device.sensors)
+    >>> len(device.sensors.items())
     15
     >>> len(device.keys())
@@ -355,4 +357,6 @@
                 self.sensors = [Sensor(sensor, xmlns) for sensor
                                 in elem.findall(xmlns + "SensorData")]
+                self.sensors = dict([(sensor["id"], sensor)
+                                    for sensor in self.sensors])
             else:
                 self[tag] = elem.text