diff --git a/src/scribe_data/language_data_extraction/Hausa/nouns/query_nouns.sparql b/src/scribe_data/language_data_extraction/Hausa/nouns/query_nouns.sparql
index aab808508..9a2aa297c 100644
--- a/src/scribe_data/language_data_extraction/Hausa/nouns/query_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Hausa/nouns/query_nouns.sparql
@@ -7,13 +7,15 @@ SELECT
   ?singular
   ?plural
   ?gender
+  ?definite
+  ?indefinite
 
 WHERE {
   ?lexeme dct:language wd:Q56475 ;
     wikibase:lexicalCategory wd:Q1084 ;
     wikibase:lemma ?singular .
-    FILTER(lang(?singular) = "ha")
-    # FILTER(lang(?singular) = "ha-arabic")
+  FILTER(lang(?singular) = "ha")
+  # FILTER(lang(?singular) = "ha-arabic")
 
   # MARK: Plural
 
@@ -21,8 +23,8 @@ WHERE {
     ?lexeme ontolex:lexicalForm ?pluralForm .
     ?pluralForm ontolex:representation ?plural ;
       wikibase:grammaticalFeature wd:Q146786 .
-      FILTER(lang(?plural) = "ha")
-      # FILTER(lang(?plural) = "ha-arabic")
+    FILTER(lang(?plural) = "ha")
+    # FILTER(lang(?plural) = "ha-arabic")
   }
 
   # MARK: Gender(s)
@@ -31,6 +33,26 @@ WHERE {
     ?lexeme wdt:P5185 ?nounGender .
   }
 
+  # MARK: Definite form
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?definiteForm .
+    ?definiteForm ontolex:representation ?definite ;
+      wikibase:grammaticalFeature wd:Q53997851 .
+    FILTER(lang(?definite) = "ha")
+    # FILTER(lang(?definite) = "ha-arabic")
+  }
+
+  # MARK: Indefinite form
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?indefiniteForm .
+    ?indefiniteForm ontolex:representation ?indefinite ;
+      wikibase:grammaticalFeature wd:Q53997857 .
+    FILTER(lang(?indefinite) = "ha")
+    # FILTER(lang(?indefinite) = "ha-arabic")
+  }
+
   SERVICE wikibase:label {
     bd:serviceParam wikibase:language "[AUTO_LANGUAGE]".
     ?nounGender rdfs:label ?gender .
diff --git a/src/scribe_data/language_data_extraction/Hausa/proper_nouns/query_proper_nouns.sparql b/src/scribe_data/language_data_extraction/Hausa/proper_nouns/query_proper_nouns.sparql
index 6bdf5f3cc..1e0996f56 100644
--- a/src/scribe_data/language_data_extraction/Hausa/proper_nouns/query_proper_nouns.sparql
+++ b/src/scribe_data/language_data_extraction/Hausa/proper_nouns/query_proper_nouns.sparql
@@ -1,18 +1,20 @@
 # tool: scribe-data
-# All Hausa (Q56475) nouns (Q1084) and the given forms.
+# All Hausa (Q56475) proper nouns (Q147276) and the given forms.
 # Enter this query at https://query.wikidata.org/.
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
   ?singular
   ?gender
+  ?definite
+  ?vocative
 
 WHERE {
   ?lexeme dct:language wd:Q56475 ;
     wikibase:lexicalCategory wd:Q147276 ;
     wikibase:lemma ?singular .
-    FILTER(lang(?singular) = "ha")
-    # FILTER(lang(?singular) = "ha-arabic")
+  FILTER(lang(?singular) = "ha")
+  # FILTER(lang(?singular) = "ha-arabic")
 
   # MARK: Gender(s)
 
@@ -20,8 +22,28 @@ WHERE {
     ?lexeme wdt:P5185 ?nounGender .
   }
 
+  # MARK: Definite form
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?definiteForm .
+    ?definiteForm ontolex:representation ?definite ;
+      wikibase:grammaticalFeature wd:Q53997851 .
+    FILTER(lang(?definite) = "ha")
+    # FILTER(lang(?definite) = "ha-arabic")
+  }
+
+  # MARK: Vocative form
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?vocativeForm .
+    ?vocativeForm ontolex:representation ?vocative ;
+      wikibase:grammaticalFeature wd:Q185077 .
+    FILTER(lang(?vocative) = "ha")
+    # FILTER(lang(?vocative) = "ha-arabic")
+  }
+
   SERVICE wikibase:label {
     bd:serviceParam wikibase:language "[AUTO_LANGUAGE]".
     ?nounGender rdfs:label ?gender .
   }
-}
+}
\ No newline at end of file
diff --git a/src/scribe_data/language_data_extraction/Hausa/verbs/query_verbs.sparql b/src/scribe_data/language_data_extraction/Hausa/verbs/query_verbs.sparql
index ed84e2dd4..16fddaacc 100644
--- a/src/scribe_data/language_data_extraction/Hausa/verbs/query_verbs.sparql
+++ b/src/scribe_data/language_data_extraction/Hausa/verbs/query_verbs.sparql
@@ -4,12 +4,67 @@
 
 SELECT
   (REPLACE(STR(?lexeme), "http://www.wikidata.org/entity/", "") AS ?lexemeID)
-  ?verb
+  ?infinitive
+  ?pastSimple
+  ?presentContinuous
+  ?futureTense
+  ?imperativeSingular
+  ?imperativePlural
 
 WHERE {
   ?lexeme dct:language wd:Q56475 ;
     wikibase:lexicalCategory wd:Q24905 ;
-    wikibase:lemma ?verb .
-    FILTER(lang(?verb) = "ha")
-    # FILTER(lang(?verb) = "ha-arabic")
-}
+    wikibase:lemma ?infinitive .
+  FILTER(lang(?infinitive) = "ha")
+  # FILTER(lang(?infinitive) = "ha-arabic")
+
+  # MARK: Past Simple
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?pastSimpleForm .
+    ?pastSimpleForm ontolex:representation ?pastSimple ;
+      wikibase:grammaticalFeature wd:Q1392475, wd:Q1240211 .
+    FILTER(lang(?pastSimple) = "ha")
+    # FILTER(lang(?pastSimple) = "ha-arabic")
+  }
+
+  # MARK: Present Continuous
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?presentContinuousForm .
+    ?presentContinuousForm ontolex:representation ?presentContinuous ;
+      wikibase:grammaticalFeature wd:Q192613, wd:Q1423695 .
+    FILTER(lang(?presentContinuous) = "ha")
+    # FILTER(lang(?presentContinuous) = "ha-arabic")
+  }
+
+  # MARK: Future Tense
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?futureTenseForm .
+    ?futureTenseForm ontolex:representation ?futureTense ;
+      wikibase:grammaticalFeature wd:Q618612 .
+    FILTER(lang(?futureTense) = "ha")
+    # FILTER(lang(?futureTense) = "ha-arabic")
+  }
+
+  # MARK: Imperative Singular
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?imperativeSingularForm .
+    ?imperativeSingularForm ontolex:representation ?imperativeSingular ;
+      wikibase:grammaticalFeature wd:Q22716, wd:Q110786 .
+    FILTER(lang(?imperativeSingular) = "ha")
+    # FILTER(lang(?imperativeSingular) = "ha-arabic")
+  }
+
+  # MARK: Imperative Plural
+
+  OPTIONAL {
+    ?lexeme ontolex:lexicalForm ?imperativePluralForm .
+    ?imperativePluralForm ontolex:representation ?imperativePlural ;
+      wikibase:grammaticalFeature wd:Q22716, wd:Q146786 .
+    FILTER(lang(?imperativePlural) = "ha")
+    # FILTER(lang(?imperativePlural) = "ha-arabic")
+  }
+}
\ No newline at end of file