Sensors with traps
Added devices and sensors refactoring