SensorHandler refactored