Added support for all sensors