Index: src/natools-static_hash_maps-s_expressions-command_maps.adb
==================================================================
--- src/natools-static_hash_maps-s_expressions-command_maps.adb
+++ src/natools-static_hash_maps-s_expressions-command_maps.adb
@@ -1,6 +1,6 @@
---  Generated at 2014-05-21 20:03:41 +0000 by Natools.Static_Hash_Maps
+--  Generated at 2014-05-26 20:24:08 +0000 by Natools.Static_Hash_Maps
 --  from natools-static_hash_maps-s_expressions-hash_maps.sx
 
 with Natools.Static_Hash_Maps.S_Expressions.Command_Pkg;
 with Natools.Static_Hash_Maps.S_Expressions.Command_Map;
 
@@ -11,11 +11,11 @@
         := Natools.Static_Hash_Maps.S_Expressions.Command_Pkg.Hash (Key);
    begin
       if Map_1_Keys (N).all = Key then
          return Map_1_Elements (N);
       else
-         raise Constraint_Error with "Key """ & Key & """ not in map";
+         return Extra_Declarations;
       end if;
    end To_Package_Command;
 
 
    function To_Map_Command (Key : String) return Map_Command is

Index: src/natools-static_hash_maps-s_expressions-command_maps.ads
==================================================================
--- src/natools-static_hash_maps-s_expressions-command_maps.ads
+++ src/natools-static_hash_maps-s_expressions-command_maps.ads
@@ -1,6 +1,6 @@
---  Generated at 2014-05-21 20:03:41 +0000 by Natools.Static_Hash_Maps
+--  Generated at 2014-05-26 20:24:08 +0000 by Natools.Static_Hash_Maps
 --  from natools-static_hash_maps-s_expressions-hash_maps.sx
 
 private package Natools.Static_Hash_Maps.S_Expressions.Command_Maps is
 
    function To_Package_Command (Key : String) return Package_Command;

Index: src/natools-static_hash_maps-s_expressions-hash_maps.sx
==================================================================
--- src/natools-static_hash_maps-s_expressions-hash_maps.sx
+++ src/natools-static_hash_maps-s_expressions-hash_maps.sx
@@ -1,10 +1,11 @@
 (Natools.Static_Hash_Maps.S_Expressions.Command_Maps
    private
    (Package_Command
       (hash-package Natools.Static_Hash_Maps.S_Expressions.Command_Pkg)
       (function To_Package_Command)
+      (not-found Extra_Declarations)
       (nodes
          (Private_Child private)
          (Public_Child public)))
    (Map_Command
       (hash-package Natools.Static_Hash_Maps.S_Expressions.Command_Map)

Index: src/natools-static_hash_maps-s_expressions.adb
==================================================================
--- src/natools-static_hash_maps-s_expressions.adb
+++ src/natools-static_hash_maps-s_expressions.adb
@@ -175,10 +175,12 @@
       case Command_Maps.To_Package_Command (Sx.To_String (Name)) is
          when Private_Child =>
             Set_Private_Child (Pkg, True);
          when Public_Child =>
             Set_Private_Child (Pkg, False);
+         when Extra_Declarations =>
+            Set_Extra_Declarations (Pkg, Sx.To_String (Name));
       end case;
    end Update_Package;
 
 
 

Index: src/natools-static_hash_maps-s_expressions.ads
==================================================================
--- src/natools-static_hash_maps-s_expressions.ads
+++ src/natools-static_hash_maps-s_expressions.ads
@@ -38,14 +38,15 @@
 
 private
 
    type Package_Command is
      (Private_Child,
-      Public_Child);
+      Public_Child,
+      Extra_Declarations);
 
    type Map_Command is
      (Hash_Package,
       Nodes,
       Function_Name,
       Not_Found);
 
 end Natools.Static_Hash_Maps.S_Expressions;