Sensors refactor