diff --git a/contexts/ngsi-ld-core.jsonld b/contexts/ngsi-ld-core.jsonld
index 1c9ed01e..c0f10c6b 100644
--- a/contexts/ngsi-ld-core.jsonld
+++ b/contexts/ngsi-ld-core.jsonld
@@ -1,29 +1,32 @@
 {
   "@context": {
-    "@vocab": "https://uri.etsi.org/ngsi-ld/default-context/",
     "id": "@id",
     "type": "@type",
-    "Property": "Property",
-    "Relationship": "Relationship",
-    "GeoProperty": "GeoProperty",
-    "Dataset": "Dataset",
-    "TimeSeries": "TimeSeries",
-    "value": "value",
-    "observedAt": "observedAt",
-    "observationSpace": "observationSpace",
-    "resultTime": "resultTime",
-    "unitCode": "unitCode",
-    "dateIssued": "dateIssued",
-    "dataProvider": "dataProvider",
-    "location": "location",
-    "dateCreated": "dateCreated",
-    "dateModified": "dateModified",
-    "createdAt": "createdAt",
-    "modifiedAt": "modifiedAt",
-    "name": "schema:name",
-    "description": "schema:description",
-    "alternateName": "schema:alternateName",
+    "Property": "https://uri.etsi.org/ngsi-ld/default-context/Property",
+    "Relationship": "https://uri.etsi.org/ngsi-ld/default-context/Relationship",
+    "GeoProperty": "https://uri.etsi.org/ngsi-ld/default-context/GeoProperty",
+    "Dataset": "https://uri.etsi.org/ngsi-ld/default-context/Dataset",
+    "TimeSeries": "https://uri.etsi.org/ngsi-ld/default-context/TimeSeries",
+    "value": "https://uri.etsi.org/ngsi-ld/default-context/value",
+    "observedAt": "https://uri.etsi.org/ngsi-ld/default-context/observedAt",
+    "observationSpace": "https://uri.etsi.org/ngsi-ld/default-context/observationSpace",
+    "resultTime": "https://uri.etsi.org/ngsi-ld/default-context/resultTime",
+    "unitCode": "https://uri.etsi.org/ngsi-ld/default-context/unitCode",
+    "dateIssued": "https://uri.etsi.org/ngsi-ld/default-context/dateIssued",
+    "dataProvider": "https://uri.etsi.org/ngsi-ld/default-context/dataProvider",
+    "location": "https://uri.etsi.org/ngsi-ld/default-context/location",
+    "dateCreated": "https://uri.etsi.org/ngsi-ld/default-context/dateCreated",
+    "dateModified": "https://uri.etsi.org/ngsi-ld/default-context/dateModified",
+    "createdAt": "https://uri.etsi.org/ngsi-ld/default-context/createdAt",
+    "modifiedAt": "https://uri.etsi.org/ngsi-ld/default-context/modifiedAt",
+    "name": "https://schema.org/name",
+    "description": "https://schema.org/description",
+    "alternateName": "https://schema.org/alternateName",
     "batteryLevel": "https://smartdatamodels.org/dataModel.Device/batteryLevel",
+    "batteryLevel_LT": "https://smartdatamodels.org/dataModel.Device/batteryLevel_LT",
+    "batteryLevel_GT": "https://smartdatamodels.org/dataModel.Device/batteryLevel_GT",
+    "batteryLevel_LE": "https://smartdatamodels.org/dataModel.Device/batteryLevel_LE",
+    "batteryLevel_GE": "https://smartdatamodels.org/dataModel.Device/batteryLevel_GE",
     "dateObserved": "https://smartdatamodels.org/dateObserved",
     "coordinates": "https://purl.org/geojson/vocab#coordinates",
     "bbox": "https://purl.org/geojson/vocab#bbox",
@@ -35,6 +38,44 @@
     "MultiDatastream": "https://uri.etsi.org/ngsi-ld/default-context/MultiDatastream",
     "Thing": "https://uri.etsi.org/ngsi-ld/default-context/Thing",
     "HistoricalLocation": "https://uri.etsi.org/ngsi-ld/default-context/HistoricalLocation",
-    "Location": "https://uri.etsi.org/ngsi-ld/default-context/Location"
+    "Location": "https://uri.etsi.org/ngsi-ld/default-context/Location",
+    "Device": "https://smartdatamodels.org/dataModel.Device/Device",
+    "DeviceModel": "https://smartdatamodels.org/dataModel.Device/DeviceModel",
+    "AirQualityObserved": "https://smartdatamodels.org/dataModel.Environment/AirQualityObserved",
+    "WeatherObserved": "https://smartdatamodels.org/dataModel.Weather/WeatherObserved",
+    "TrafficFlowObserved": "https://smartdatamodels.org/dataModel.Transportation/TrafficFlowObserved",
+    "OnStreetParking": "https://smartdatamodels.org/dataModel.Parking/OnStreetParking",
+    "NoiseLevelObserved": "https://smartdatamodels.org/dataModel.Environment/NoiseLevelObserved",
+    "StreetLightingModel": "https://smartdatamodels.org/dataModel.Streetlighting/StreetLightingModel",
+    "Point": "https://purl.org/geojson/vocab#Point",
+    "LineString": "https://purl.org/geojson/vocab#LineString",
+    "Polygon": "https://purl.org/geojson/vocab#Polygon",
+    "temperature": "https://smartdatamodels.org/dataModel.Weather/temperature",
+    "relativeHumidity": "https://smartdatamodels.org/dataModel.Weather/relativeHumidity",
+    "rainfall": "https://smartdatamodels.org/dataModel.Weather/rainfall",
+    "uvIndex": "https://smartdatamodels.org/dataModel.Weather/uvIndex",
+    "windSpeed": "https://smartdatamodels.org/dataModel.Weather/windSpeed",
+    "windDirection": "https://smartdatamodels.org/dataModel.Weather/windDirection",
+    "pressure": "https://smartdatamodels.org/dataModel.Weather/pressure",
+    "NO2": "https://smartdatamodels.org/dataModel.Environment/NO2",
+    "PM10": "https://smartdatamodels.org/dataModel.Environment/PM10",
+    "PM25": "https://smartdatamodels.org/dataModel.Environment/PM25",
+    "O3": "https://smartdatamodels.org/dataModel.Environment/O3",
+    "CO": "https://smartdatamodels.org/dataModel.Environment/CO",
+    "SO2": "https://smartdatamodels.org/dataModel.Environment/SO2",
+    "airQualityIndex": "https://smartdatamodels.org/dataModel.Environment/airQualityIndex",
+    "noiseLevel": "https://smartdatamodels.org/dataModel.Environment/noiseLevel",
+    "noisePeak": "https://smartdatamodels.org/dataModel.Environment/noisePeak",
+    "noiseCategory": "https://smartdatamodels.org/dataModel.Environment/noiseCategory",
+    "vehicleCount": "https://smartdatamodels.org/dataModel.Transportation/vehicleCount",
+    "averageVehicleSpeed": "https://smartdatamodels.org/dataModel.Transportation/averageVehicleSpeed",
+    "congestion": "https://smartdatamodels.org/dataModel.Transportation/congestion",
+    "occupancy": "https://smartdatamodels.org/dataModel.Transportation/occupancy",
+    "availableSpotNumber": "https://smartdatamodels.org/dataModel.Parking/availableSpotNumber",
+    "totalSpotNumber": "https://smartdatamodels.org/dataModel.Parking/totalSpotNumber",
+    "turnover": "https://smartdatamodels.org/dataModel.Parking/turnover",
+    "illuminance": "https://smartdatamodels.org/dataModel.Streetlighting/illuminance",
+    "power": "https://smartdatamodels.org/dataModel.Streetlighting/power",
+    "status": "https://smartdatamodels.org/dataModel.Streetlighting/status"
   }
 }
diff --git a/simulator.py b/simulator.py
index 8e3ef58e..08143a2d 100644
--- a/simulator.py
+++ b/simulator.py
@@ -131,7 +131,7 @@ for stype, locs in SENSOR_LOCATIONS.items():
 # =============================================================================
 # Contextes NGSI-LD : core + Smart Data Models
 # https://smartdatamodels.org pour les @context officiels
-STELLIO_CONTEXT_URL = "http://172.29.0.5:8085"
+STELLIO_CONTEXT_URL = "https://gitea.digitribe.fr/eric/smart-city-digital-twin-martinique/raw/branch/master/contexts"
 ORION_CONTEXT = [
     f"{STELLIO_CONTEXT_URL}/ngsi-ld-core.jsonld",
     "https://raw.githubusercontent.com/smart-data-models/dataModel.Environment/master/context.jsonld",