diff --git a/src/macedonian/MorphoMkd.gf b/src/macedonian/MorphoMkd.gf
index 59fab7a0..c1bb9b81 100644
--- a/src/macedonian/MorphoMkd.gf
+++ b/src/macedonian/MorphoMkd.gf
@@ -15376,8 +15376,8 @@ mkAdv base_1 =
   { s = base_1
   } ;
 
-mkPron : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Pron =
-  \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15 ->
+mkPron : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> GenNum -> Person -> Pron =
+  \f1,f2,f3,f4,f5,f6,f7,f8,f9,f10,f11,f12,f13,f14,f15,g,p ->
       { s = table {
               RSubj => f1 ;
               RObj Acc => f2 ;
@@ -15404,7 +15404,9 @@ mkPron : (_,_,_,_,_,_,_,_,_,_,_,_,_,_,_ : Str) -> Pron =
                          GPl        => f14
                        }
             } ;
-        poss_clitic = f15
+        poss_clitic = f15 ;
+        g = g ;
+        p = p ;
       } ;
 
 }
diff --git a/src/macedonian/ResMkd.gf b/src/macedonian/ResMkd.gf
index cce2ad05..797e57ef 100644
--- a/src/macedonian/ResMkd.gf
+++ b/src/macedonian/ResMkd.gf
@@ -153,7 +153,7 @@ oper mkAdv : Str -> Adv =
 
 param Case = Acc | Dat ;
 param Role = RSubj | RObj Case | RPrep ;
-oper Pron = {s : Role => Str; clitic : Case => Str} ;
+oper Pron = {s : Role => Str; clitic : Case => Str; g : GenNum; p : Person} ;
 
 genNum : Gender -> Number -> GenNum = \g,n ->
   case n of {
diff --git a/src/macedonian/StructuralMkd.gf b/src/macedonian/StructuralMkd.gf
index a51c1498..0db5d8da 100644
--- a/src/macedonian/StructuralMkd.gf
+++ b/src/macedonian/StructuralMkd.gf
@@ -1,13 +1,13 @@
-concrete StructuralMkd of Structural = CatMkd ** open MorphoMkd in {
+concrete StructuralMkd of Structural = CatMkd ** open ResMkd,MorphoMkd in {
 
-lin i_Pron = mkPron "јас" "мене" "ме" "мене" "ми" "мене" "мој" "мојот" "моја" "мојата" "мое" "моето" "мои" "моите" "ми" ;
-lin youSg_Pron = mkPron "ти" "тебе" "те" "тебе" "ти" "тебе" "твој" "твојот" "твоја" "твојата" "твое" "твоето" "твои" "твоите" "ти" ;
-lin he_Pron = mkPron "тој" "него" "го" "нему" "му" "него" "негов" "неговиот" "негова" "неговата" "негово" "неговото" "негови" "неговите" "му" ;
-lin she_Pron = mkPron "таа" "неа" "ја" "нејзе" "ѝ" "неа" "нејзин" "нејзиниот" "нејзина" "нејзината" "нејзино" "нејзиното" "нејзини" "нејзините" "ѝ" ;
-lin it_Pron = mkPron "тоа" "него" "го" "нему" "му" "него" "негов" "неговиот" "негова" "неговата" "негово" "неговото" "негови" "неговите" "му" ;
-lin we_Pron = mkPron "ние" "нас" "нѐ" "нам" "ни" "нас" "наш" "нашиот" "наша" "нашата" "наше" "нашето" "наши" "нашите" "ни" ;
-lin youPl_Pron = mkPron "вие" "вас" "ве" "вам" "ви" "вас" "ваш" "вашиот" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" "ви" ;
-lin youPol_Pron = mkPron "вие" "вас" "ве" "вам" "ви" "вас" "ваш" "вашиот" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" "ви" ;
-lin they_Pron = mkPron "тие" "нив" "ги" "ним" "им" "нив" "нивен" "нивниот" "нивна" "нивната" "нивно" "нивното" "нивни" "нивните" "им" ;
+lin i_Pron = mkPron "јас" "мене" "ме" "мене" "ми" "мене" "мој" "мојот" "моја" "мојата" "мое" "моето" "мои" "моите" "ми" (GSg Masc) P1 ;
+lin youSg_Pron = mkPron "ти" "тебе" "те" "тебе" "ти" "тебе" "твој" "твојот" "твоја" "твојата" "твое" "твоето" "твои" "твоите" "ти" (GSg Masc) P2 ;
+lin he_Pron = mkPron "тој" "него" "го" "нему" "му" "него" "негов" "неговиот" "негова" "неговата" "негово" "неговото" "негови" "неговите" "му" (GSg Masc) P3 ;
+lin she_Pron = mkPron "таа" "неа" "ја" "нејзе" "ѝ" "неа" "нејзин" "нејзиниот" "нејзина" "нејзината" "нејзино" "нејзиното" "нејзини" "нејзините" "ѝ" (GSg Masc) P3 ;
+lin it_Pron = mkPron "тоа" "него" "го" "нему" "му" "него" "негов" "неговиот" "негова" "неговата" "негово" "неговото" "негови" "неговите" "му" (GSg Masc) P3 ;
+lin we_Pron = mkPron "ние" "нас" "нѐ" "нам" "ни" "нас" "наш" "нашиот" "наша" "нашата" "наше" "нашето" "наши" "нашите" "ни" GPl P1 ;
+lin youPl_Pron = mkPron "вие" "вас" "ве" "вам" "ви" "вас" "ваш" "вашиот" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" "ви" GPl P2 ;
+lin youPol_Pron = mkPron "вие" "вас" "ве" "вам" "ви" "вас" "ваш" "вашиот" "ваша" "вашата" "ваше" "вашето" "ваши" "вашите" "ви" (GSg Masc) P2 ;
+lin they_Pron = mkPron "тие" "нив" "ги" "ним" "им" "нив" "нивен" "нивниот" "нивна" "нивната" "нивно" "нивното" "нивни" "нивните" "им" GPl P3 ;
 
 }