More changes for sensor aggregation.