diff --git a/index/alire-index-templates_parser.ads b/index/alire-index-templates_parser.ads
new file mode 100644
index 00000000..fad84931
--- /dev/null
+++ b/index/alire-index-templates_parser.ads
@@ -0,0 +1,34 @@
+with Alire.Index.XMLAda;
+
+package Alire.Index.Templates_Parser is
+
+   function Project is new Catalogued_Project
+     ("Templates Parser: File generation from templates in Ada");
+
+   Repo : constant URL := "https://github.com/AdaCore/templates-parser.git";
+
+   Base : constant Release := Project.Unreleased
+     (Dependencies =>
+        XMLAda.V_18_2.Within_Major,
+
+      Properties =>
+        GPR_Scenario ("PRJ_BUILD", "Debug" or "Release") and
+        GPR_Scenario ("TP_TASKING", "No_Tasking " or  "Standard_Tasking") and
+        GPR_Scenario ("TP_XMLADA", "Installed " or  "Disabled") and
+        GPR_Scenario ("LIBRARY_TYPE", "static" or  "relocatable") and
+
+        Maintainer ("AdaCore") and
+        Website    ("https://github.com/AdaCore/templates-parser") and
+        License    (GPL_3_0),
+
+      Private_Properties =>
+        GPR_External ("TP_XMLADA", "Installed") and
+        Action_Run (Post_Fetch, "cp config/tp_xmlada_installed.gpr tp_xmlada.gpr")
+     );
+
+   package V_18_2 is new Project_Release
+     (Base
+      .Replacing
+        (Git (Repo, "cfb146506fa2fa276e935244021d44e0d834c342")));
+
+end Alire.Index.Templates_Parser;
diff --git a/index/alire-index-xmlada.ads b/index/alire-index-xmlada.ads
index 15127100..3f063c9b 100644
--- a/index/alire-index-xmlada.ads
+++ b/index/alire-index-xmlada.ads
@@ -6,115 +6,31 @@ package Alire.Index.XMLAda is
 
    Base : constant Release := Project.Unreleased
      (Properties =>
+        GPR_Scenario ("LIBRARY_TYPE", "relocatable" or "static" or "static-pic") and
+        GPR_Scenario ("BUILD", "distrib" or  "Debug" or "Production" or "profile" or "coverage" or "nochecks") and
+
+        Project_File ("distrib/xmlada.gpr") and
+
         Maintainer ("AdaCore") and
         Website    ("https://github.com/AdaCore/xmlada") and
-        License    (GPL_3_0) and
+        License    (GPL_3_0),
 
-        Action_Run (Post_Fetch, "sh configure"));
+      Private_Properties =>
+        Project_File ("dom/xmlada_dom.gpr") and
+        Project_File ("input_sources/xmlada_input.gpr") and
+        Project_File ("sax/xmlada_sax.gpr") and
+        Project_File ("schema/xmlada_schema.gpr") and
+        Project_File ("unicode/xmlada_unicode.gpr") and
 
-   ---------
-   -- DOM --
-   ---------
+        Action_Run (Post_Fetch, "sh configure") and
+        Action_Run (Post_Fetch, "rm -f xmlada.gpr"), -- Else it conflicts
 
-   package DOM is
+      Available_When =>
+        Operating_System /= Windows);
 
-      function Project is new Catalogued_Project
-        (XMLAda.Project.Description & " (DOM)");
-
-      Base : constant Release := Project.Unreleased
-        (Properties =>
-           XMLAda.Base.Properties and
-           Project_File ("dom/xmlada_dom.gpr"));
-
-      package V_18_2 is new Project_Release
-        (Base
-         .Replacing
-           (Git (Repo, "5c3c4a1621a970849601a9df36423d8974c13dec")));
-
-   end DOM;
-
-   -------------------
-   -- Input_Sources --
-   -------------------
-
-   package Input_Sources is
-
-      function Project is new Catalogued_Project
-        (XMLAda.Project.Description & " (Input Sources)");
-
-      Base : constant Release := Project.Unreleased
-        (Properties =>
-           XMLAda.Base.Properties and
-           Project_File ("input_sources/xmlada_input.gpr"));
-
-      package V_18_2 is new Project_Release
-        (Base
-         .Replacing
-           (Git (Repo, "5c3c4a1621a970849601a9df36423d8974c13dec")));
-
-   end Input_Sources;
-
-   ---------
-   -- SAX --
-   ---------
-
-   package SAX is
-
-      function Project is new Catalogued_Project
-        (XMLAda.Project.Description & " (SAX)");
-
-      Base : constant Release := Project.Unreleased
-        (Properties =>
-           XMLAda.Base.Properties and
-           Project_File ("sax/xmlada_sax.gpr"));
-
-      package V_18_2 is new Project_Release
-        (Base
-         .Replacing
-           (Git (Repo, "5c3c4a1621a970849601a9df36423d8974c13dec")));
-
-   end SAX;
-
-   ------------
-   -- Schema --
-   ------------
-
-   package Schema is
-
-      function Project is new Catalogued_Project
-        (XMLAda.Project.Description & " (Schema)");
-
-      Base : constant Release := Project.Unreleased
-        (Properties =>
-           XMLAda.Base.Properties and
-           Project_File ("schema/xmlada_schema.gpr"));
-
-      package V_18_2 is new Project_Release
-        (Base
-         .Replacing
-           (Git (Repo, "5c3c4a1621a970849601a9df36423d8974c13dec")));
-
-   end Schema;
-
-   -------------
-   -- Unicode --
-   -------------
-
-   package Unicode is
-
-      function Project is new Catalogued_Project
-        (XMLAda.Project.Description & " (Unicode)");
-
-      Base : constant Release := Project.Unreleased
-        (Properties =>
-           XMLAda.Base.Properties and
-           Project_File ("unicode/xmlada_unicode.gpr"));
-
-      package V_18_2 is new Project_Release
-        (Base
-         .Replacing
-           (Git (Repo, "5c3c4a1621a970849601a9df36423d8974c13dec")));
-
-   end Unicode;
+   package V_18_2 is new Project_Release
+     (Base
+      .Replacing
+        (Git (Repo, "5c3c4a1621a970849601a9df36423d8974c13dec")));
 
 end Alire.Index.XMLAda;
diff --git a/src/alire-releases.ads b/src/alire-releases.ads
index df886f7f..7430e6e0 100644
--- a/src/alire-releases.ads
+++ b/src/alire-releases.ads
@@ -107,6 +107,8 @@ package Alire.Releases with Preelaborate is
    
    function Properties (R : Release) return Conditional.Properties;
    
+   function Private_Properties (R : Release) return Conditional.Properties;
+   
    function Depends (R : Release;
                      P : Alire.Properties.Vector)
                      return Conditional.Dependencies;
@@ -240,7 +242,10 @@ private
      (R.Dependencies.Evaluate (P));
    
    function Properties (R : Release) return Conditional.Properties is
-      (R.Properties);
+     (R.Properties);
+   
+   function Private_Properties (R : Release) return Conditional.Properties is
+     (R.Priv_Props);
    
    function Origin  (R : Release) return Origins.Origin is (R.Origin);
    function Available (R : Release) return Requisites.Tree is (R.Available);