Additional Changes for libsensor