diff --git a/data_node/data_node.install b/data_node/data_node.install
index 50f41f5ecae9c8b4644f6f1d71d79478ad742a35..8fa8e3840b4b7bc81ed34d03e69b05f257f73649 100644
--- a/data_node/data_node.install
+++ b/data_node/data_node.install
@@ -36,6 +36,7 @@ function data_node_schema() {
       'nid' => array('nid'),
       'data_table_name' => array('data_table_name'),
       'id' => array('id'),
+      'name_id' => array('data_table_name', 'id'),
     ),
     'primary key' => array('nid', 'data_table_name', 'id'),
   );
@@ -54,4 +55,13 @@ function data_node_install() {
  */
 function data_node_uninstall() {
   drupal_uninstall_schema('data_node');
+}
+
+/**
+ * Add an index to id and name.
+ */
+function data_node_update_6001() {
+  $ret = array();
+  db_add_index($ret, 'data_table_node', 'name_id', array('data_table_name', 'id'));
+  return $ret;
 }
\ No newline at end of file