Minor changes: renaming of the sensor, replace flags with booleans and enum