diff --git a/uc_order/views/uc_order.views.inc b/uc_order/views/uc_order.views.inc
index c42047d..a0be3e3 100644
--- a/uc_order/views/uc_order.views.inc
+++ b/uc_order/views/uc_order.views.inc
@@ -385,22 +385,48 @@ function uc_order_views_data() {
     'help' => t('Products that have been ordered in your Ubercart store.'),
   );
 
-  // Pull in node fields directly.
-  $data['node']['table']['join']['uc_order_products'] = array(
-    'left_field' => 'nid',
-    'field' => 'nid',
-  );
-
-  // Pull in product fields directly.
-  $data['uc_products']['table']['join']['uc_order_products'] = array(
-    'left_field' => 'nid',
-    'field' => 'nid',
+  $data['uc_order_products']['nid'] = array(
+    'title' => t('Node nid'),
+    'help' => t('The nid of the ordered product. If you need more fields than the nid: Node relationship'),
+    'relationship' => array(
+      'title' => t('Node'),
+      'help' => t('Relate product to node.'),
+      'handler' => 'views_handler_relationship',
+      'base' => 'node',
+      'field' => 'nid',
+      'label' => t('Node'),
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_node_nid',
+    ),
+    'field' => array(
+      'handler' => 'views_handler_field_node',
+    ),
   );
 
-  // Pull in order fields directly.
-  $data['uc_orders']['table']['join']['uc_order_products'] = array(
-    'left_field' => 'order_id',
-    'field' => 'order_id',
+  $data['uc_order_products']['order_id'] = array(
+    'title' => t('Order id'),
+    'help' => t('The order id of the ordered product. If you need more fields than the order id: Order relationship'),
+    'relationship' => array(
+      'title' => t('Order'),
+      'help' => t('Relate product to order.'),
+      'handler' => 'views_handler_relationship',
+      'base' => 'uc_orders',
+      'field' => 'order_id',
+      'label' => t('Order'),
+    ),
+    'filter' => array(
+      'handler' => 'views_handler_filter_numeric',
+    ),
+    'argument' => array(
+      'handler' => 'views_handler_argument_numeric',
+    ),
+    'field' => array(
+      'handler' => 'uc_order_handler_field_order_id',
+    ),
   );
 
   // Expose products to their orders as a relationship.