diff --git a/uc_attribute/uc_attribute.install b/uc_attribute/uc_attribute.install
index 8b1eed9..560ffab 100644
--- a/uc_attribute/uc_attribute.install
+++ b/uc_attribute/uc_attribute.install
@@ -123,7 +123,10 @@ function uc_attribute_schema() {
     ),
     'primary key' => array('oid'),
     'foreign keys' => array(
-      'aid' => array('uc_attributes' => 'aid'),
+      'uc_attributes' => array(
+        'table' => 'uc_attributes',
+        'columns' => array('aid' => 'aid'),
+      ),
     ),
   );
 
@@ -184,8 +187,14 @@ function uc_attribute_schema() {
     ),
     'primary key' => array('pcid', 'aid'),
     'foreign keys' => array(
-      'pcid' => array('uc_product_classes' => 'pcid'),
-      'aid' => array('uc_attributes' => 'aid'),
+      'uc_product_classes' => array(
+        'table' => 'uc_product_classes',
+        'columns' => array('pcid' => 'pcid'),
+      ),
+      'uc_attributes' => array(
+        'table' => 'uc_attributes',
+        'columns' => array('aid' => 'aid'),
+      ),
     ),
   );
 
@@ -238,8 +247,14 @@ function uc_attribute_schema() {
     ),
     'primary key' => array('pcid', 'oid'),
     'foreign keys' => array(
-      'pcid' => array('uc_product_classes' => 'pcid'),
-      'oid' => array('uc_attribute_options' => 'oid'),
+      'uc_product_classes' => array(
+        'table' => 'uc_product_classes',
+        'columns' => array('pcid' => 'pcid'),
+      ),
+      'uc_attribute_options' => array(
+        'table' => 'uc_attribute_options',
+        'columns' => array('oid' => 'oid'),
+      ),
     ),
   );
 
@@ -300,8 +315,14 @@ function uc_attribute_schema() {
     ),
     'primary key' => array('nid', 'aid'),
     'foreign keys' => array(
-      'nid' => array('uc_products' => 'nid'),
-      'aid' => array('uc_attributes' => 'aid'),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array('nid' => 'nid'),
+      ),
+      'uc_attributes' => array(
+        'table' => 'uc_attributes',
+        'columns' => array('aid' => 'aid'),
+      ),
     ),
   );
 
@@ -354,8 +375,14 @@ function uc_attribute_schema() {
     ),
     'primary key' => array('nid', 'oid'),
     'foreign keys' => array(
-      'nid' => array('uc_products' => 'nid'),
-      'oid' => array('uc_attribute_options' => 'oid'),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array('nid' => 'nid'),
+      ),
+      'uc_attribute_options' => array(
+        'table' => 'uc_attribute_options',
+        'columns' => array('oid' => 'oid'),
+      ),
     ),
   );
 
@@ -389,7 +416,10 @@ function uc_attribute_schema() {
       'nid' => array('nid'),
     ),
     'foreign keys' => array(
-      'nid' => array('uc_product' => 'nid'),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array('nid' => 'nid'),
+      ),
     ),
   );
 
diff --git a/uc_cart/uc_cart.install b/uc_cart/uc_cart.install
index 130cbbf..55f89a5 100644
--- a/uc_cart/uc_cart.install
+++ b/uc_cart/uc_cart.install
@@ -58,7 +58,10 @@ function uc_cart_schema() {
     ),
     'primary key' => array('cart_item_id'),
     'foreign keys' => array(
-      'nid' => array('node' => 'nid'),
+      'node' => array(
+        'table' => 'node',
+        'columns' => array('nid' => 'nid'),
+      ),
     ),
   );
 
diff --git a/uc_file/uc_file.install b/uc_file/uc_file.install
index f25ae68..78d96cc 100644
--- a/uc_file/uc_file.install
+++ b/uc_file/uc_file.install
@@ -112,8 +112,14 @@ function uc_file_schema() {
     ),
     'primary key' => array('fpid'),
     'foreign keys' => array(
-      'pfid' => array('uc_product_features' => 'pfid'),
-      'fid' => array('uc_files' => 'fid'),
+      'uc_product_features' => array(
+        'table' => 'uc_product_features',
+        'columns' => array('pfid' => 'pfid'),
+      ),
+      'uc_files' => array(
+        'table' => 'uc_files',
+        'columns' => array('fid' => 'fid'),
+      ),
     ),
   );
 
@@ -198,9 +204,18 @@ function uc_file_schema() {
     ),
     'primary key' => array('fuid'),
     'foreign keys' => array(
-      'pfid' => array('uc_product_features' => 'pfid'),
-      'fid' => array('uc_files' => 'fid'),
-      'uid' => array('users' => 'uid'),
+      'uc_product_features' => array(
+        'table' => 'uc_product_features',
+        'columns' => array('pfid' => 'pfid'),
+      ),
+      'uc_files' => array(
+        'table' => 'uc_files',
+        'columns' => array('fid' => 'fid'),
+      ),
+      'users' => array(
+        'table' => 'users',
+        'columns' => array('uid' => 'uid'),
+      ),
     ),
   );
 
diff --git a/uc_order/uc_order.install b/uc_order/uc_order.install
index bc24c6a..cf25936 100644
--- a/uc_order/uc_order.install
+++ b/uc_order/uc_order.install
@@ -245,8 +245,14 @@ function uc_order_schema() {
     ),
     'primary key' => array('order_id'),
     'foreign keys' => array(
-      'uid' => array('users' => 'uid'),
-      'order_status' => array('uc_order_statuses' => 'order_status_id'),
+      'users' => array(
+        'table' => 'users',
+        'columns' => array('uid' => 'uid'),
+      ),
+      'uc_order_statuses' => array(
+        'table' => 'uc_order_statuses',
+        'columns' => array('order_status' => 'order_status_id'),
+      ),
     ),
   );
 
@@ -289,8 +295,14 @@ function uc_order_schema() {
     ),
     'primary key' => array('comment_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
-      'uid' => array('users' => 'uid'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
+      'users' => array(
+        'table' => 'users',
+        'columns' => array('uid' => 'uid'),
+      ),
     ),
   );
 
@@ -347,8 +359,14 @@ function uc_order_schema() {
     ),
     'primary key' => array('comment_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
-      'uid' => array('users' => 'uid'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
+      'users' => array(
+        'table' => 'users',
+        'columns' => array('uid' => 'uid'),
+      ),
     ),
   );
 
@@ -408,7 +426,10 @@ function uc_order_schema() {
     ),
     'primary key' => array('line_item_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
     ),
   );
 
@@ -451,8 +472,14 @@ function uc_order_schema() {
     ),
     'primary key' => array('order_log_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
-      'uid' => array('users' => 'uid'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
+      'users' => array(
+        'table' => 'users',
+        'columns' => array('uid' => 'uid'),
+      ),
     ),
   );
 
@@ -542,8 +569,14 @@ function uc_order_schema() {
     ),
     'primary key' => array('order_product_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
-      'nid' => array('node' => 'nid'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
+      'node' => array(
+        'table' => 'node',
+        'columns' => array('nid' => 'nid'),
+      ),
     ),
   );
 
diff --git a/uc_product/uc_product.install b/uc_product/uc_product.install
index 56e0810..172393b 100644
--- a/uc_product/uc_product.install
+++ b/uc_product/uc_product.install
@@ -69,7 +69,10 @@ function uc_product_schema() {
     ),
     'primary key' => array('pfid'),
     'foreign keys' => array(
-      'nid' => array('uc_product' => 'nid'),
+      'uc_product' => array(
+        'table' => 'uc_product',
+        'columns' => array('nid' => 'nid'),
+      ),
     ),
   );
 
@@ -203,8 +206,10 @@ function uc_product_schema() {
     ),
     'primary key' => array('vid'),
     'foreign keys' => array(
-      'nid' => array('node' => 'nid'),
-      'vid' => array('node' => 'vid'),
+      'node' => array(
+        'table' => 'node',
+        'columns' => array('vid' => 'vid'),
+      ),
     ),
   );
 
diff --git a/uc_product_kit/uc_product_kit.install b/uc_product_kit/uc_product_kit.install
index 0a811cc..08a07dd 100644
--- a/uc_product_kit/uc_product_kit.install
+++ b/uc_product_kit/uc_product_kit.install
@@ -71,9 +71,14 @@ function uc_product_kit_schema() {
     ),
     'primary key' => array('vid', 'product_id'),
     'foreign keys' => array(
-      'nid' => array('uc_products' => 'nid'),
-      'vid' => array('uc_products' => 'vid'),
-      'product_id' => array('uc_products' => 'nid'),
+      'node' => array(
+        'table' => 'node',
+        'columns' => array('vid' => 'vid'),
+      ),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array('product_id' => 'nid'),
+      ),
     ),
   );
 
diff --git a/uc_roles/uc_roles.install b/uc_roles/uc_roles.install
index bb64832..3d213b6 100644
--- a/uc_roles/uc_roles.install
+++ b/uc_roles/uc_roles.install
@@ -109,9 +109,18 @@ function uc_roles_schema() {
     ),
     'primary key' => array('rpid'),
     'foreign keys' => array(
-      'pfid' => array('uc_product_features' => 'pfid'),
-      'nid' => array('uc_products' => 'nid'),
-      'rid' => array('role' => 'rid'),
+      'uc_product_features' => array(
+        'table' => 'uc_product_features',
+        'columns' => array('pfid' => 'pfid'),
+      ),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array('nid' => 'nid'),
+      ),
+      'role' => array(
+        'table' => 'role',
+        'columns' => array('rid' => 'rid'),
+      ),
     ),
   );
 
@@ -156,8 +165,14 @@ function uc_roles_schema() {
     ),
     'primary key' => array('reid'),
     'foreign keys' => array(
-      'uid' => array('users' => 'uid'),
-      'rid' => array('role' => 'rid'),
+      'users' => array(
+        'table' => 'users',
+        'columns' => array('uid' => 'uid'),
+      ),
+      'role' => array(
+        'table' => 'role',
+        'columns' => array('rid' => 'rid'),
+      ),
     ),
   );
 
diff --git a/uc_stock/uc_stock.install b/uc_stock/uc_stock.install
index e70f6e1..ba4a272 100644
--- a/uc_stock/uc_stock.install
+++ b/uc_stock/uc_stock.install
@@ -56,7 +56,10 @@ function uc_stock_schema() {
     ),
     'primary key' => array('sku'),
     'foreign keys' => array(
-      'nid' => array('uc_products' => 'nid'),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array('nid' => 'nid'),
+      ),
     ),
   );
 
diff --git a/uc_store/uc_store.install b/uc_store/uc_store.install
index 279268e..c7b14b9 100644
--- a/uc_store/uc_store.install
+++ b/uc_store/uc_store.install
@@ -119,7 +119,10 @@ function uc_store_schema() {
     ),
     'primary key' => array('zone_id'),
     'foreign keys' => array(
-      'zone_country_id' => array('uc_countries' => 'country_id'),
+      'uc_countries' => array(
+        'table' => 'uc_countries',
+        'columns' => array('zone_country_id' => 'country_id'),
+      ),
     ),
   );