Fixing missing imports and order change
Fixing Sensors parser