Added sensor support