Added ability to handle multiple sensors