diff --git a/index/alire-index-matreshka.ads b/index/alire-index-matreshka.ads
new file mode 100644
index 00000000..7df160cc
--- /dev/null
+++ b/index/alire-index-matreshka.ads
@@ -0,0 +1,50 @@
+package Alire.Index.Matreshka is
+
+   --  The build process of this package is a bit special.
+   --  As other big projects, it includes a configuration step.
+   --  In this case is an Ada tool that we can build in advance and use.
+
+   --  There is no easy way in current Alire to individually select components
+   --  to build, which furthermore have differing dependencies. For now,
+   --  only components without dependencies are built then.
+
+--     package No_DB is
+--
+--        function Project is new Catalogued_Project
+--          ("Ada framework to develop information systems (databases missing)");
+--
+--        Repo : constant URL := "https://github.com/reznikmm/matreshka.git";
+--
+--        Install_To : constant String := "alrinst";
+--
+--        Base       : constant Release := Project.Unreleased
+--          (Properties         =>
+--             Project_File (Install_To & "/lib/gnat/matreshka/league.gpr") and
+--
+--             Maintainer ("Vadim Godunko") and
+--             Maintainer ("Maxim Reznik") and
+--             Website    ("http://forge.ada-ru.org/matreshka") and
+--             License    (BSD_3_Clause) and
+--             Comment    ("NOTE: ONLY COMPONENTS WITHOUT DEPENDENCIES IN THIS PACKAGE"),
+--
+--           Private_Properties =>
+--             Action_Run (Post_Fetch, "make config") and
+--             Action_Run (Post_Fetch,
+--               "./configure --prefix=" & Install_To &
+--                 " --enable-amf" &
+--                 " --disable-sqlite3 --disable-postgresql --disable-firebird --disable-oracle --disable-mysql") and
+--             Action_Run (Post_Fetch, "make") and
+--             Action_Run (Post_Fetch, "make install"),
+--
+--           Available_When     =>
+--             Operating_System /= Windows);
+--
+--        package V_0_7 is new Project_Release
+--          (Base
+--           .Replacing
+--             (Git (Repo, "9ce672ea383179392bdad3967fa37537db72fa20")));
+--
+--     end No_DB;
+
+
+end Alire.Index.Matreshka;
diff --git a/index/native/alire-index-libgraph_easy_perl.ads b/index/native/alire-index-libgraph_easy_perl.ads
new file mode 100644
index 00000000..b9f6443a
--- /dev/null
+++ b/index/native/alire-index-libgraph_easy_perl.ads
@@ -0,0 +1,11 @@
+package Alire.Index.Libgraph_Easy_Perl is
+
+   function Project is new Catalogued_Project ("Drawing of ASCII graphs");
+
+   V_Rolling : constant Release :=
+                 Project.Register
+                   (V ("0.0-rolling"),
+                    Native ((Debian | Ubuntu => Packaged_As ("libgraph-easy-perl"),
+                             others          => Unavailable)));
+
+end Alire.Index.Libgraph_Easy_Perl;
diff --git a/src/alire-containers.adb b/src/alire-containers.adb
index b116e31a..bb870914 100644
--- a/src/alire-containers.adb
+++ b/src/alire-containers.adb
@@ -1,3 +1,5 @@
+with Semantic_Versioning;
+
 package body Alire.Containers is
 
    ------------
diff --git a/src/alire-containers.ads b/src/alire-containers.ads
index 707729c9..94502213 100644
--- a/src/alire-containers.ads
+++ b/src/alire-containers.ads
@@ -8,8 +8,6 @@ with Alire.Dependencies;
 with Alire.Milestones;
 with Alire.Releases;
 
-with Semantic_Versioning;
-
 package Alire.Containers with Preelaborate is
 
    package Dependency_Lists Is new Ada.Containers.Indefinite_Doubly_Linked_Lists
@@ -30,10 +28,6 @@ package Alire.Containers with Preelaborate is
                                                                      Releases."=");
    subtype Release_H is Release_Holders.Holder;
 
-   package Project_Version_Maps is new Ada.Containers.Indefinite_Ordered_Maps
-     (Alire.Project, Semantic_Versioning.Version, "<", Semantic_Versioning."<");
-   subtype Version_Map is Project_Version_Maps.Map;
-
 
    package Project_Release_Maps is new Ada.Containers.Indefinite_Ordered_Maps
      (Alire.Project, Releases.Release, "<", Releases."=");