diff --git a/geomagio/api/data/data_api.py b/geomagio/api/data/data_api.py
index 30164fa786d78bbd4abc6e025390b701c9aab633..6c102a35ddc9837e1a962219d10f7a7ef5bb729b 100644
--- a/geomagio/api/data/data_api.py
+++ b/geomagio/api/data/data_api.py
@@ -15,7 +15,7 @@ from ...iaga2002 import IAGA2002Writer
 from ...imfjson import IMFJSONWriter
 from ...TimeseriesUtility import get_interval_from_delta
 from .DataApiQuery import DataApiQuery, DataType, OutputFormat, SamplingPeriod
-from .elements import elements
+from .elements import ELEMENTS, ELEMENT_INDEX
 
 ERROR_CODE_MESSAGES = {
     204: "No Data",
@@ -238,4 +238,14 @@ def get_data(request: Request, query: DataApiQuery = Depends(parse_query)):
 
 @app.get("/elements/")
 def get_elements():
+    elements = {"type": "FeatureCollection", "features": []}
+    for e in ELEMENTS:
+        elements["features"].append(
+            {
+                "type": "Feature",
+                "id": e.id,
+                "properties": {"name": e.name, "units": e.units},
+                "geometry": None,
+            }
+        )
     return JSONResponse(elements)
diff --git a/geomagio/api/data/elements.py b/geomagio/api/data/elements.py
index 67bb747f06f039efabdb719f3b0a463fddc68840..1ed9c18e3926c978393c9e83f7b0896bb721053c 100644
--- a/geomagio/api/data/elements.py
+++ b/geomagio/api/data/elements.py
@@ -8,142 +8,37 @@ class Element(BaseModel):
     units: str
 
 
-elements = {
-    "type": "FeatureCollection",
-    "features": [
-        {
-            "type": "Feature",
-            "id": "H",
-            "properties": {"name": "Observatory North Component", "units": "nT"},
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "E",
-            "properties": {"name": "Observatory East Component", "units": "nT"},
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "D",
-            "properties": {"name": "Declination (deci-arcminute)", "units": "dam"},
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "Z",
-            "properties": {"name": "Observatory Vertical Component", "units": "nT"},
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "F",
-            "properties": {"name": "Total Field Magnitude", "units": "nT"},
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "G",
-            "properties": {"abbreviation": "ΔF", "name": "Delta F", "units": "∆nT"},
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "X",
-            "properties": {"name": "Geographic North Magnitude", "units": "nT"},
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "Y",
-            "properties": {"name": "Geographic East Magnitude", "units": "nT"},
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "MDT",
-            "properties": {
-                "abbreviation": "Dist",
-                "name": "Disturbance",
-                "units": "nT",
-            },
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "MSQ",
-            "properties": {"abbreviation": "SQ", "name": "Solar Quiet", "units": "nT"},
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "MSV",
-            "properties": {
-                "abbreviation": "SV",
-                "name": "Solar Variation",
-                "units": "nT",
-            },
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "E-N",
-            "properties": {
-                "abbreviation": "E-N",
-                "name": "E-Field North",
-                "units": "mV/km",
-            },
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "E-E",
-            "properties": {
-                "abbreviation": "E-E",
-                "name": "E-Field East",
-                "units": "mV/km",
-            },
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "UK1",
-            "properties": {
-                "abbreviation": "T-Electric",
-                "name": "Electronics Temperature",
-                "units": "°C",
-            },
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "UK3",
-            "properties": {
-                "abbreviation": "T-Fluxgate",
-                "name": "Fluxgate Temperature",
-                "units": "°C",
-            },
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "UK2",
-            "properties": {
-                "abbreviation": "T-Total Field",
-                "name": "Total Field Temperature",
-                "units": "°C",
-            },
-            "geometry": None,
-        },
-        {
-            "type": "Feature",
-            "id": "UK4",
-            "properties": {
-                "abbreviation": "T-Outside",
-                "name": "Outside Temperature",
-                "units": "°C",
-            },
-            "geometry": None,
-        },
-    ],
-}
+ELEMENTS = [
+    Element(id="H", abbreviation="H", name="Observatory North Component", units="nT"),
+    Element(id="E", abbreviation="E", name="Observatory East Component", units="nT"),
+    Element(id="X", abbreviation="X", name="Geographic North Magnitude", units="nT"),
+    Element(id="Y", abbreviation="Y", name="Geographic East Magnitude", units="nT"),
+    Element(id="D", abbreviation="D", name="Declination (deci-arcminute)", units="dam"),
+    Element(
+        id="Z", abbreviation="Z", name="Observatory Vertical Component", units="nT"
+    ),
+    Element(id="F", abbreviation="F", name="Total Field Magnitude", units="nT"),
+    Element(
+        id="G", abbreviation="ΔF", name="Observatory Vertical Component", units="∆nT"
+    ),
+    Element(id="E-E", abbreviation="E-E", name="E=Field East", units="mV/km"),
+    Element(id="E-N", abbreviation="E-N", name="E-Field North", units="mV/km"),
+    Element(id="MDT", abbreviation="DIST", name="Disturbance", units="nT"),
+    Element(id="MSQ", abbreviation="SQ", name="Solar Quiet", units="nT"),
+    Element(id="MSV", abbreviation="SV", name="Solar Variation", units="nT"),
+    Element(
+        id="UK1", abbreviation="T-Electric", name="Electronics Temperature", units="°C"
+    ),
+    Element(
+        id="UK2",
+        abbreviation="T-Total Field",
+        name="Total Field Temperature",
+        units="°C",
+    ),
+    Element(
+        id="UK3", abbreviation="T-Fluxgate", name="Fluxgate Temperature", units="°C"
+    ),
+    Element(id="UK4", abbreviation="T-Outside", name="Outside Temperature", units="°C"),
+]
+
+ELEMENT_INDEX = {e.id: e for e in ELEMENTS}