More modifications to the sensors extension

Still not finished.