Added sensors handling