diff --git a/juddges/data/nsa/extractor.py b/juddges/data/nsa/extractor.py
index 2f85834..92cd591 100644
--- a/juddges/data/nsa/extractor.py
+++ b/juddges/data/nsa/extractor.py
@@ -6,8 +6,8 @@
 from bs4 import BeautifulSoup, Tag
 
 
-FIELD_MAP = {
-    "id": "id",
+DESCRIPTION_MAP = {
+    "id": "ID in the NSA database",
     "Sygnatura": "Docket number",
     "Powołane przepisy": "The cited provisions",
     "Sygn. powiązane": "Related docket numbers",
@@ -34,29 +34,58 @@
     "Prawomocność": "Finality",
 }
 
+FIELD_MAP = {
+    "id": "id",
+    "Sygnatura": "docket_no",
+    "Powołane przepisy": "cited_provisions",
+    "Sygn. powiązane": "related_dockets",
+    "Sędziowie": "judges",
+    "Data orzeczenia": "judgment_date",
+    "Rodzaj orzeczenia": "decision_type",
+    "przewodniczący": "presiding_judge",
+    "sprawozdawca": "rapporteur",
+    "ustawa": "law",
+    "dziennik_ustaw": "journal",
+    "art": "article",
+    "Data wpływu": "submission_date",
+    "Sąd": "court",
+    "Symbol z opisem": "case_type",
+    "Hasła tematyczne": "keywords",
+    "Skarżony organ": "challenged_authority",
+    "Treść wyniku": "verdict",
+    "Publikacja w u.z.o.": "published_in_collection",
+    "Info. o glosach": "glosa_info",
+    "Sentencja": "sentence",
+    "Uzasadnienie": "reasons",
+    "Tezy": "theses",
+    "Zdanie odrębne": "dissenting_opinion",
+    "Prawomocność": "finality",
+}
+
+
 ORDER = [
     "id",
-    "Docket number",
-    "Type of decision",
-    "Finality",
-    "The day of the judgment",
-    "Date of submission",
-    "Court",
-    "Judges",
-    "Presiding judge",
-    "Judge rapporteur",
-    "Type of case with the detailed description",
-    "Keywords",
-    "Related docket numbers",
-    "Challenged authority",
-    "Nature of the verdict",
-    "The cited provisions",
-    "Published in official collection of judgments Jurisprudence of the Voivodeship Administrative Courts and the Supreme Administrative Court",
-    "Information on glosa(s)",
-    "Theses",
-    "Sentence of the judgment",
-    "Reasons for judgment",
-    "Dissenting opinion",
+    "docket_no",
+    "decision_type",
+    "finality",
+    "judgment_date",
+    "submission_date",
+    "court",
+    "judges",
+    "presiding_judge",
+    "rapporteur",
+    "case_type",
+    "keywords",
+    "related_dockets",
+    "challenged_authority",
+    "verdict",
+    "cited_provisions",
+    "published_in_collection",
+    "glosa_info",
+    "theses",
+    "sentence",
+    "reasons",
+    "dissenting_opinion",
 ]
 
 LIST_TYPE_FIELDS = {