Added sensor support, still much to do