Changes in order to use the sensor server