Code changes to support ADD and DELETE of Sensor. **Working copy**