diff --git a/runtime/adainclude/system-storage_elements.ads b/runtime/adainclude/system-storage_elements.ads
index 0833b23..906080e 100644
--- a/runtime/adainclude/system-storage_elements.ads
+++ b/runtime/adainclude/system-storage_elements.ads
@@ -1,10 +1,12 @@
 package System.Storage_Elements
    with Pure is
 
-   type Storage_Offset is range -2**31 .. 2**31 - 1;
+   type Storage_Offset is range 
+      -2 ** (Word_Size - 1) ..
+       2 ** (Word_Size - 1) - 1;
    subtype Storage_Count is Storage_Offset range 0 .. Storage_Offset'Last;
 
-   type Storage_Element is mod 2**8;
+   type Storage_Element is mod 2 ** Storage_Unit;
    for Storage_Element'Size use Storage_Unit;
 
    type Storage_Array is array
@@ -20,7 +22,7 @@ package System.Storage_Elements
    function "-" (Left : Storage_Offset; Right : Address) return Address
       with Import, Convention => Intrinsic;
 
-   type Integer_Address is mod 2**32;
+   type Integer_Address is mod Memory_Size;
    function To_Address (Value : Integer_Address) return Address
       with Import, Convention => Intrinsic;
    function To_Integer (Value : Address) return Integer_Address