SensorData refact related