SensorFactory was little bit refactored