Improve SensorMappings