Added support for multiple sensors