diff --git a/src/albanian/CatSqi.gf b/src/albanian/CatSqi.gf
index b2a7972f..5c6211ac 100644
--- a/src/albanian/CatSqi.gf
+++ b/src/albanian/CatSqi.gf
@@ -22,5 +22,6 @@ lincat Num = {s : Str; n : Number} ;
 lincat Quant = {s : Str; spec : Species} ;
 lincat Det = {s : Str; spec : Species; n : Number} ;
 lincat NP = {s: Case => Str; a : Agr} ;
+lincat Pron = {s: Case => Str; acc_clit, dat_clit : Str; a : Agr} ;
 
 }
diff --git a/src/albanian/GrammarSqi.gf b/src/albanian/GrammarSqi.gf
index ee625cfb..7817b128 100644
--- a/src/albanian/GrammarSqi.gf
+++ b/src/albanian/GrammarSqi.gf
@@ -1,7 +1,8 @@
 concrete GrammarSqi of Grammar =
   NounSqi,
   AdjectiveSqi,
-  NumeralSqi
+  NumeralSqi,
+  StructuralSqi
   ** {
 
 } ;
diff --git a/src/albanian/NounSqi.gf b/src/albanian/NounSqi.gf
index b8ccd1fc..2f3e357f 100644
--- a/src/albanian/NounSqi.gf
+++ b/src/albanian/NounSqi.gf
@@ -8,6 +8,8 @@ concrete NounSqi of Noun = CatSqi ** open MorphoSqi, ResSqi in {
       a = agrgP3 cn.g det.n
       } ;
 
+    UsePron p = p ;
+
     DetQuant quant num = {
       s  = quant.s ++ num.s ;
       n  = num.n ;
diff --git a/src/albanian/ParadigmsSqi.gf b/src/albanian/ParadigmsSqi.gf
index a9e7fc15..9f587650 100644
--- a/src/albanian/ParadigmsSqi.gf
+++ b/src/albanian/ParadigmsSqi.gf
@@ -1235,7 +1235,15 @@ mkQuant : Str -> Quant = \s -> lin Quant {s=s; spec=Indef} ;
 mkDet : Str -> Number -> Det = \s,n -> lin Det {s=s; spec=Indef; n=n} ;
 mkConj : Str -> Conj = \s -> lin Conj {s=s} ;
 mkPConj : Str -> PConj = \s -> lin PConj {s=s} ;
-mkPron : Str -> Pron = \s -> lin Pron {s=s} ;
+
+mkPron : (nom,acc,dat,ablat,acc_clit,dat_clit : Str) -> GenNum -> Person -> Pron =
+  \nom,acc,dat,ablat,acc_clit,dat_clit,gn,p -> lin Pron 
+     {s = table Case [nom; acc; dat; ablat];
+      acc_clit = acc_clit;
+      dat_clit = dat_clit;
+      a = {gn=gn; p=p}
+     } ;
+
 mkCard : Str -> Card = \s -> lin Card {s=s} ;
 mkACard : Str -> ACard = \s -> lin ACard {s=s} ;
 mkPredet : Str -> Predet = \s -> lin Predet {s=s} ;
diff --git a/src/albanian/StructuralSqi.gf b/src/albanian/StructuralSqi.gf
new file mode 100644
index 00000000..f0dfc612
--- /dev/null
+++ b/src/albanian/StructuralSqi.gf
@@ -0,0 +1,12 @@
+concrete StructuralSqi of Structural = CatSqi ** open ResSqi, ParadigmsSqi in {
+
+lin i_Pron = mkPron "unë" "mua" "mua" "meje" "më" "më" (GSg Masc) P1 ;
+lin youSg_Pron = mkPron "ti" "ty" "ty" "teje" "të" "të" (GSg Masc) P2 ;
+lin he_Pron = mkPron "ai" "atë" "atij" "atij" "e" "i" (GSg Masc) P3 ;
+lin she_Pron = mkPron "ajo" "atë" "asaj" "asaj" "e" "i" (GSg Fem) P3 ;
+lin it_Pron = mkPron "ai" "atë" "atij" "atij" "e" "i" (GSg Masc) P3 ;
+lin we_Pron = mkPron "ne" "ne" "neve" "nesh" "na" "na" GPl P1 ;
+lin youPl_Pron = mkPron "ju" "ju" "juve" "jush" "ju" "ju" GPl P2 ;
+lin they_Pron = mkPron "ata" "ata" "atyre" "atyre" "i" "u" GPl P3 ;
+
+}