diff --git a/lib/resource-1.4/demo/Clause.gf b/lib/resource-1.4/demo/Clause.gf
index 0960c2fd2..49f711380 100644
--- a/lib/resource-1.4/demo/Clause.gf
+++ b/lib/resource-1.4/demo/Clause.gf
@@ -6,4 +6,16 @@ fun
   PredAP  : NP -> AP -> Cl ;
   PredAdv : NP -> Adv -> Cl ;
 
+    UseCl  : Tense -> Ant -> Pol -> Cl  -> S ;
+
+  QuestV  : IP -> V -> QCl ;
+  QuestV2 : IP -> V2 -> NP -> QCl ;
+  QuestV2Slash : IP -> NP -> V2 -> QCl ;
+
+    UseQCl : Tense -> Ant -> Pol -> QCl -> QS ;
+
+  ImpV   : V -> Imp ;
+  ImpV2  : V2 -> NP -> Imp ;
+
+
 }
diff --git a/lib/resource-1.4/demo/ClauseBul.gf b/lib/resource-1.4/demo/ClauseBul.gf
new file mode 100644
index 000000000..9f35b1ca1
--- /dev/null
+++ b/lib/resource-1.4/demo/ClauseBul.gf
@@ -0,0 +1 @@
+concrete ClauseBul of Clause = CatBul ** ClauseI with (Grammar = GrammarBul) ;
diff --git a/lib/resource-1.4/demo/ClauseI.gf b/lib/resource-1.4/demo/ClauseI.gf
index 47bab4c73..309af322c 100644
--- a/lib/resource-1.4/demo/ClauseI.gf
+++ b/lib/resource-1.4/demo/ClauseI.gf
@@ -6,4 +6,15 @@ lin
   PredAP s a = PredVP s (UseComp (CompAP a)) ;
   PredAdv s a = PredVP s (UseComp (CompAdv a)) ;
 
+  UseCl = Grammar.UseCl ;
+
+  QuestV np v = QuestVP np (UseV v) ;
+  QuestV2 s v o = QuestVP s (ComplSlash (SlashV2a v) o) ;
+  QuestV2Slash ip s v = QuestSlash ip (SlashVP s (SlashV2a v)) ;
+
+  UseQCl = Grammar.UseQCl ;
+
+  ImpV v = ImpVP (UseV v) ;
+  ImpV2 v o = ImpVP (ComplSlash (SlashV2a v) o) ;
+
 }
diff --git a/lib/resource-1.4/demo/ClauseIta.gf b/lib/resource-1.4/demo/ClauseIta.gf
new file mode 100644
index 000000000..8602d5878
--- /dev/null
+++ b/lib/resource-1.4/demo/ClauseIta.gf
@@ -0,0 +1 @@
+concrete ClauseIta of Clause = CatIta ** ClauseI with (Grammar = GrammarIta) ;
diff --git a/lib/resource-1.4/demo/ClauseSwe.gf b/lib/resource-1.4/demo/ClauseSwe.gf
new file mode 100644
index 000000000..c082d814f
--- /dev/null
+++ b/lib/resource-1.4/demo/ClauseSwe.gf
@@ -0,0 +1 @@
+concrete ClauseSwe of Clause = CatSwe ** ClauseI with (Grammar = GrammarSwe) ;
diff --git a/lib/resource-1.4/demo/Demo.gf b/lib/resource-1.4/demo/Demo.gf
index a959fb481..6888d3282 100644
--- a/lib/resource-1.4/demo/Demo.gf
+++ b/lib/resource-1.4/demo/Demo.gf
@@ -1,15 +1,15 @@
 abstract Demo =  
-  Noun- [AdvCN],
+  Noun - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
 --  Verb,
   Clause, -- 
-  Adjective,
+  Adjective - [SentAP],
   Adverb,
   Numeral,
-----  Sentence, 
-----  Question,
+--  Sentence, 
+  Question - [QuestVP,QuestSlash],
 ----  Relative,
 ----  Conjunction,
-----  Phrase,
+  Phrase,
 ----  Text,
 ----  Idiom,
   Structural,
diff --git a/lib/resource-1.4/demo/DemoBul.gf b/lib/resource-1.4/demo/DemoBul.gf
new file mode 100644
index 000000000..05dee5c50
--- /dev/null
+++ b/lib/resource-1.4/demo/DemoBul.gf
@@ -0,0 +1,23 @@
+--# -path=.:alltenses
+
+concrete DemoBul of Demo = 
+  NounBul - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+--  VerbBul, 
+  ClauseBul, --
+  AdjectiveBul - [SentAP],
+  AdverbBul,
+  NumeralBul,
+----  SentenceBul,
+----  QuestionBul,
+----  RelativeBul,
+----  ConjunctionBul,
+----  PhraseBul,
+----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  IdiomBul,
+  StructuralBul,
+  LexiconBul
+  ** {
+
+flags startcat = Phr ; unlexer = text ; lexer = text ;
+
+} ;
diff --git a/lib/resource-1.4/demo/DemoEng.gf b/lib/resource-1.4/demo/DemoEng.gf
index 7c995acd3..3151b45be 100644
--- a/lib/resource-1.4/demo/DemoEng.gf
+++ b/lib/resource-1.4/demo/DemoEng.gf
@@ -1,14 +1,14 @@
 --# -path=.:alltenses
 
 concrete DemoEng of Demo = 
-  NounEng - [AdvCN], 
+  NounEng - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP], 
 --  VerbEng, 
   ClauseEng, --
-  AdjectiveEng,
+  AdjectiveEng - [SentAP],
   AdverbEng,
   NumeralEng,
 ----  SentenceEng,
-----  QuestionEng,
+  QuestionEng - [QuestVP,QuestSlash],
 ----  RelativeEng,
 ----  ConjunctionEng,
 ----  PhraseEng,
diff --git a/lib/resource-1.4/demo/DemoFin.gf b/lib/resource-1.4/demo/DemoFin.gf
index ff1e5d020..3e0a61cc8 100644
--- a/lib/resource-1.4/demo/DemoFin.gf
+++ b/lib/resource-1.4/demo/DemoFin.gf
@@ -1,17 +1,17 @@
 --# -path=.:alltenses
 
 concrete DemoFin of Demo = 
-  NounFin - [AdvCN], 
+  NounFin - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
 --  VerbFin, 
   ClauseFin, --
-  AdjectiveFin,
+  AdjectiveFin - [SentAP],
   AdverbFin,
   NumeralFin,
 ----  SentenceFin,
-----  QuestionFin,
+  QuestionFin - [QuestVP,QuestSlash],
 ----  RelativeFin,
 ----  ConjunctionFin,
-----  PhraseFin,
+  PhraseFin,
 ----  TextX,
 ----  IdiomFin,
   StructuralFin,
diff --git a/lib/resource-1.4/demo/DemoFre.gf b/lib/resource-1.4/demo/DemoFre.gf
index d34a51f5e..77b9e7b56 100644
--- a/lib/resource-1.4/demo/DemoFre.gf
+++ b/lib/resource-1.4/demo/DemoFre.gf
@@ -1,10 +1,10 @@
 --# -path=.:alltenses
 
 concrete DemoFre of Demo = 
-  NounFre - [AdvCN], 
+  NounFre - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
 --  VerbFre, 
   ClauseFre, --
-  AdjectiveFre,
+  AdjectiveFre - [SentAP],
   AdverbFre,
   NumeralFre,
 ----  SentenceFre,
diff --git a/lib/resource-1.4/demo/DemoGer.gf b/lib/resource-1.4/demo/DemoGer.gf
index 393163e3b..a96c8d86e 100644
--- a/lib/resource-1.4/demo/DemoGer.gf
+++ b/lib/resource-1.4/demo/DemoGer.gf
@@ -1,14 +1,14 @@
 --# -path=.:alltenses
 
 concrete DemoGer of Demo = 
-  NounGer - [AdvCN], 
+  NounGer - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
 --  VerbGer, 
   ClauseGer, --
-  AdjectiveGer,
+  AdjectiveGer - [SentAP],
   AdverbGer,
   NumeralGer,
 --  SentenceGer,
---  QuestionGer,
+  QuestionGer - [QuestVP,QuestSlash],
 --  RelativeGer,
 --  ConjunctionGer,
 --  PhraseGer,
diff --git a/lib/resource-1.4/demo/DemoIta.gf b/lib/resource-1.4/demo/DemoIta.gf
new file mode 100644
index 000000000..f27944b6b
--- /dev/null
+++ b/lib/resource-1.4/demo/DemoIta.gf
@@ -0,0 +1,23 @@
+--# -path=.:alltenses
+
+concrete DemoIta of Demo = 
+  NounIta - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+--  VerbIta, 
+  ClauseIta, --
+  AdjectiveIta - [SentAP],
+  AdverbIta,
+  NumeralIta,
+----  SentenceIta,
+----  QuestionIta,
+----  RelativeIta,
+----  ConjunctionIta,
+----  PhraseIta,
+----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  IdiomIta,
+  StructuralIta,
+  LexiconIta
+  ** {
+
+flags startcat = Phr ; unlexer = text ; lexer = text ;
+
+} ;
diff --git a/lib/resource-1.4/demo/DemoSwe.gf b/lib/resource-1.4/demo/DemoSwe.gf
new file mode 100644
index 000000000..72d4a2c25
--- /dev/null
+++ b/lib/resource-1.4/demo/DemoSwe.gf
@@ -0,0 +1,23 @@
+--# -path=.:alltenses
+
+concrete DemoSwe of Demo = 
+  NounSwe - [AdvCN,PredetNP,PPartNP,RelNP,RelCN,SentCN,ApposCN,MassNP,DetNP],
+--  VerbSwe, 
+  ClauseSwe, --
+  AdjectiveSwe - [SentAP],
+  AdverbSwe,
+  NumeralSwe,
+----  SentenceSwe,
+----  QuestionSwe,
+----  RelativeSwe,
+----  ConjunctionSwe,
+----  PhraseSwe,
+----  TextX - [Tense,TPres,TPast,TFut,TCond],
+----  IdiomSwe,
+  StructuralSwe,
+  LexiconSwe
+  ** {
+
+flags startcat = Phr ; unlexer = text ; lexer = text ;
+
+} ;