diff --git a/payment/uc_google_checkout/uc_google_checkout.install b/payment/uc_google_checkout/uc_google_checkout.install
index dab1fee..1f5255e 100644
--- a/payment/uc_google_checkout/uc_google_checkout.install
+++ b/payment/uc_google_checkout/uc_google_checkout.install
@@ -39,8 +39,13 @@ function uc_google_checkout_schema() {
     ),
     'primary key' => array('vid'),
     'foreign keys' => array(
-      'nid' => array('uc_products' => 'nid'),
-      'vid' => array('uc_products' => 'vid'),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array(
+          'nid' => 'nid',
+          'vid' => 'vid',
+        ),
+      )
     ),
   );
 
@@ -89,7 +94,10 @@ function uc_google_checkout_schema() {
     ),
     'primary key' => array('order_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
     ),
   );
 
diff --git a/payment/uc_payment/uc_payment.install b/payment/uc_payment/uc_payment.install
index aa77313..19b2ba8 100644
--- a/payment/uc_payment/uc_payment.install
+++ b/payment/uc_payment/uc_payment.install
@@ -70,7 +70,10 @@ function uc_payment_schema() {
     ),
     'primary key' => array('receipt_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
     ),
   );
 
diff --git a/payment/uc_payment_pack/uc_payment_pack.install b/payment/uc_payment_pack/uc_payment_pack.install
index 3fb653d..f37dc52 100644
--- a/payment/uc_payment_pack/uc_payment_pack.install
+++ b/payment/uc_payment_pack/uc_payment_pack.install
@@ -39,7 +39,10 @@ function uc_payment_pack_schema() {
     ),
     'primary key' => array('check_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
     ),
   );
 
@@ -80,7 +83,10 @@ function uc_payment_pack_schema() {
     ),
     'primary key' => array('order_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
     ),
   );
 
@@ -104,7 +110,10 @@ function uc_payment_pack_schema() {
     ),
     'primary key' => array('order_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
     ),
   );
 
diff --git a/payment/uc_paypal/uc_paypal.install b/payment/uc_paypal/uc_paypal.install
index 0bee5a2..b661472 100644
--- a/payment/uc_paypal/uc_paypal.install
+++ b/payment/uc_paypal/uc_paypal.install
@@ -99,7 +99,10 @@ function uc_paypal_schema() {
       'order_id' => array('order_id'),
     ),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
     ),
   );
 
diff --git a/shipping/uc_flatrate/uc_flatrate.install b/shipping/uc_flatrate/uc_flatrate.install
index a39fbc5..bdd1e88 100644
--- a/shipping/uc_flatrate/uc_flatrate.install
+++ b/shipping/uc_flatrate/uc_flatrate.install
@@ -45,9 +45,17 @@ function uc_flatrate_schema() {
     ),
     'primary key' => array('vid', 'mid'),
     'foreign keys' => array(
-      'nid' => array('uc_products' => 'nid'),
-      'vid' => array('uc_products' => 'vid'),
-      'mid' => array('uc_flatrate_methods' => 'mid'),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array(
+          'nid' => 'nid',
+          'vid' => 'vid',
+        ),
+      ),
+      'uc_flatrate_methods' => array(
+        'table' => 'uc_flatrate_methods',
+        'columns' => array('mid' => 'mid'),
+      ),
     ),
   );
 
diff --git a/shipping/uc_quote/uc_quote.install b/shipping/uc_quote/uc_quote.install
index 2a89df8..c964ba0 100644
--- a/shipping/uc_quote/uc_quote.install
+++ b/shipping/uc_quote/uc_quote.install
@@ -122,7 +122,10 @@ function uc_quote_schema() {
     ),
     'primary key' => array('nid'),
     'foreign keys' => array(
-      'nid' => array('uc_products' => 'nid'),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array('nid' => 'nid'),
+      ),
     ),
   );
 
@@ -163,7 +166,10 @@ function uc_quote_schema() {
       'order_id_quote_method' => array('order_id', 'method'),
     ),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
     ),
   );
 
diff --git a/shipping/uc_shipping/uc_shipping.install b/shipping/uc_shipping/uc_shipping.install
index 16b4480..4cdbbcf 100644
--- a/shipping/uc_shipping/uc_shipping.install
+++ b/shipping/uc_shipping/uc_shipping.install
@@ -221,7 +221,10 @@ function uc_shipping_schema() {
     ),
     'primary key' => array('sid'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
     ),
   );
 
@@ -305,10 +308,22 @@ function uc_shipping_schema() {
     ),
     'primary key' => array('package_id'),
     'foreign keys' => array(
-      'order_id' => array('uc_orders' => 'order_id'),
-      'shipping_type' => array('uc_quote_shipping_types' => 'shipping_type'),
-      'sid' => array('uc_shipments' => 'sid'),
-      'label_image' => array('file' => 'fid'),
+      'uc_orders' => array(
+        'table' => 'uc_orders',
+        'columns' => array('order_id' => 'order_id'),
+      ),
+      'uc_quote_shipping_types' => array(
+        'table' => 'uc_quote_shipping_types',
+        'columns' => array('shipping_type' => 'shipping_type'),
+      ),
+      'uc_shipments' => array(
+        'table' => 'uc_shipments',
+        'columns' => array('sid' => 'sid'),
+      ),
+      'file' => array(
+        'table' => 'file',
+        'columns' => array('label_image' => 'fid'),
+      ),
     ),
   );
 
diff --git a/shipping/uc_ups/uc_ups.install b/shipping/uc_ups/uc_ups.install
index ffd45a6..cb6c9ef 100644
--- a/shipping/uc_ups/uc_ups.install
+++ b/shipping/uc_ups/uc_ups.install
@@ -38,8 +38,13 @@ function uc_ups_schema() {
     ),
     'primary key' => array('vid'),
     'foreign keys' => array(
-      'nid' => array('uc_products' => 'nid'),
-      'vid' => array('uc_products' => 'vid'),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array(
+          'nid' => 'nid',
+          'vid' => 'vid',
+        ),
+      ),
     ),
   );
 
diff --git a/shipping/uc_usps/uc_usps.install b/shipping/uc_usps/uc_usps.install
index 77166ba..f1ea49c 100644
--- a/shipping/uc_usps/uc_usps.install
+++ b/shipping/uc_usps/uc_usps.install
@@ -38,8 +38,13 @@ function uc_usps_schema() {
     ),
     'primary key' => array('vid'),
     'foreign keys' => array(
-      'nid' => array('uc_products' => 'nid'),
-      'vid' => array('uc_products' => 'vid'),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array(
+          'nid' => 'nid',
+          'vid' => 'vid',
+        ),
+      ),
     ),
   );
 
diff --git a/shipping/uc_weightquote/uc_weightquote.install b/shipping/uc_weightquote/uc_weightquote.install
index 8305b8b..4578fd0 100644
--- a/shipping/uc_weightquote/uc_weightquote.install
+++ b/shipping/uc_weightquote/uc_weightquote.install
@@ -45,9 +45,17 @@ function uc_weightquote_schema() {
     ),
     'primary key' => array('vid', 'mid'),
     'foreign keys' => array(
-      'nid' => array('uc_products' => 'nid'),
-      'vid' => array('uc_products' => 'vid'),
-      'mid' => array('uc_weightquote_methods' => 'mid'),
+      'uc_products' => array(
+        'table' => 'uc_products',
+        'columns' => array(
+          'nid' => 'nid',
+          'vid' => 'vid',
+        ),
+      ),
+      'uc_weightquote_methods' => array(
+        'table' => 'uc_weightquote_methods',
+        'columns' => array('mid' => 'mid'),
+      ),
     ),
   );
 
diff --git a/uc_product/uc_product.install b/uc_product/uc_product.install
index 172393b..aa7f1b9 100644
--- a/uc_product/uc_product.install
+++ b/uc_product/uc_product.install
@@ -208,7 +208,10 @@ function uc_product_schema() {
     'foreign keys' => array(
       'node' => array(
         'table' => 'node',
-        'columns' => array('vid' => 'vid'),
+        'columns' => array(
+          'nid' => 'nid'
+          'vid' => 'vid',
+        ),
       ),
     ),
   );
diff --git a/uc_product_kit/uc_product_kit.install b/uc_product_kit/uc_product_kit.install
index 08a07dd..a993466 100644
--- a/uc_product_kit/uc_product_kit.install
+++ b/uc_product_kit/uc_product_kit.install
@@ -73,7 +73,10 @@ function uc_product_kit_schema() {
     'foreign keys' => array(
       'node' => array(
         'table' => 'node',
-        'columns' => array('vid' => 'vid'),
+        'columns' => array(
+          'nid' => 'nid'
+          'vid' => 'vid',
+        ),
       ),
       'uc_products' => array(
         'table' => 'uc_products',