Updated SensorHandler