Sensors and routing
Refactoring