More work on the data store and sensor objects. Thanks Ernest.