Added some support for sensors