diff --git a/.gitattributes b/.gitattributes
index afb7bcb..2ab546b 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -421,6 +421,8 @@ src/h5_core/h5t_consts.c -text
 src/h5_core/h5t_consts_private.h -text
 src/h5_core/h5t_errorhandling.c -text
 src/h5_core/h5t_errorhandling_private.h -text
+src/h5_core/h5t_hsearch.c -text
+src/h5_core/h5t_hsearch_private.h -text
 src/h5_core/h5t_inquiry.c -text
 src/h5_core/h5t_inquiry.h -text
 src/h5_core/h5t_map.c -text
diff --git a/src/h5_core/h5t_hsearch.c b/src/h5_core/h5t_hsearch.c
new file mode 100644
index 0000000..e9e91ce
--- /dev/null
+++ b/src/h5_core/h5t_hsearch.c
@@ -0,0 +1,282 @@
+#include <stdlib.h>
+#include <string.h>
+#include "h5_core/h5_core.h"
+#include "h5_core/h5_core_private.h"
+
+static int
+_cmp_te_entries (
+	void *__a,
+	void *__b
+	) {
+	return memcmp ( __a, __b, sizeof(h5_2id_t) );
+}
+
+static unsigned int
+_compute_te_hashval (
+	void *__item
+	) {
+	h5_te_entry_t *item = (h5_te_entry_t*)__item;
+	char *key = (char *)item->key.vids;
+	unsigned int count = 2 * sizeof ( item->key.vids[0] );
+	unsigned int hval = count;
+	while ( count-- > 0 ) {
+		if ( key[count] ) {
+			hval <<= 4;
+			hval += key[count];
+		}
+	}
+	return hval;
+}
+
+h5_err_t
+_h5t_create_te_htab (
+	h5_file_t * const f,
+	size_t nel
+	) {
+	h5t_adjacencies_t *a = &f->t->adjacencies;
+	return _h5_hcreate_r (
+		      f,
+		      nel,
+		      &a->te_hash,
+		      _cmp_te_entries,
+		      _compute_te_hashval );
+}
+
+h5_err_t
+_h5t_resize_te_htab (
+	h5_file_t * const f,
+	size_t nel
+	) {
+	h5t_adjacencies_t *a = &f->t->adjacencies;
+	if ( a->te_hash.size == 0 ) {
+		TRY ( _h5t_create_te_htab ( f, nel ) );
+	} else if ( a->te_hash.size < nel ) {
+		TRY ( _h5_hresize_r ( f, nel, &a->te_hash ) );
+	}
+	return H5_SUCCESS;
+}
+
+h5_err_t
+_h5t_search_te2 (
+	h5_file_t * const f,
+	h5_id_t face,
+	h5_id_t eid,
+	h5_te_entry_t **entry
+	) {
+	h5t_fdata_t *t = f->t;
+	h5t_adjacencies_t *a = &t->adjacencies;
+	void *__retval;
+
+	TRY ( *entry = _h5_calloc ( f, 1, sizeof(**entry) ) );
+
+	TRY ( h5t_get_local_vids_of_edge2 (
+		f,
+		face,
+		eid,
+		(*entry)->key.vids ) );
+	/*
+	  resize hash table if more than 3/4 filled
+	 */
+	if ( (a->te_hash.size*6) <= (a->te_hash.filled<<3) ) {
+		h5_id_t num_elems = t->num_elems[t->num_levels-1];
+		TRY ( _h5_hresize_r (
+			      f,
+			      3*(num_elems - eid),
+			      &a->te_hash ) );
+	}
+	TRY ( _h5_hsearch_r (
+		      f,
+		      *entry,
+		      H5_ENTER,
+		      &__retval,
+		      &a->te_hash ) );
+	h5_te_entry_t *retval = (h5_te_entry_t *)__retval;
+	TRY ( _h5_search_idlist (
+		      f,
+		      &retval->value,
+		      _h5t_build_edge_id ( face, eid ) ) );
+	if ( retval->value.num_items > 1 ) {
+		/* search returned an existing entry */
+		TRY ( _h5_free ( f, *entry ) );
+	}
+	return H5_SUCCESS;
+}
+
+/*
+  Find item in the T(E) hash table.
+
+  Passing item with type entry type.
+*/
+h5_err_t
+_h5t_find_te (
+	h5_file_t * const f,
+	h5_te_entry_t *item,
+	h5_te_entry_t **retval
+	) {
+	void *__ret;
+	TRY ( _h5_hsearch_r (
+		      f,
+		      item,
+		      H5_FIND,
+		      &__ret,
+		      &f->t->adjacencies.te_hash ) );
+	*retval = (h5_te_entry_t *)__ret;
+	return H5_SUCCESS;
+}
+
+/*
+  Find item in the T(E) hash table.
+
+  Passing item with face and local element ID.
+*/
+h5_err_t
+_h5t_find_te2 (
+	h5_file_t * const f,
+	h5_id_t face_id,
+	h5_id_t local_eid,
+	h5_te_entry_t **retval
+	) {
+	h5_te_entry_t item;
+	TRY ( h5t_get_local_vids_of_edge2 (
+		f,
+		face_id,
+		local_eid,
+		item.key.vids
+		      ) );
+	return _h5t_find_te ( f, &item, retval );
+}
+
+static int
+_cmp_td_entries (
+	void *__a,
+	void *__b
+	) {
+	return memcmp ( __a, __b, sizeof(h5_3id_t) );
+}
+
+static unsigned int
+_compute_td_hashval (
+	void *__item
+	) {
+	h5_te_entry_t *item = (h5_te_entry_t*)__item;
+	char *key = (char *)item->key.vids;
+	unsigned int count = sizeof ( h5_3id_t );
+	unsigned int hval = count;
+	while ( count-- > 0 ) {
+		if ( key[count] ) {
+			hval <<= 4;
+			hval += key[count];
+		}
+	}
+	return hval;
+}
+
+h5_err_t
+_h5t_create_td_htab (
+	h5_file_t * const f,
+	size_t nel
+	) {
+	h5t_adjacencies_t *a = &f->t->adjacencies;
+	return _h5_hcreate_r (
+		      f,
+		      nel,
+		      &a->td_hash,
+		      _cmp_td_entries,
+		      _compute_td_hashval );
+}
+
+h5_err_t
+_h5t_resize_td_htab (
+	h5_file_t * const f,
+	size_t nel
+	) {
+	h5t_adjacencies_t *a = &f->t->adjacencies;
+	if ( a->td_hash.size == 0 ) {
+		TRY ( _h5t_create_td_htab ( f, nel ) );
+	} else if ( a->td_hash.size < nel ) {
+		TRY ( _h5_hresize_r ( f, nel, &a->td_hash ) );
+	}
+	return H5_SUCCESS;
+}
+
+h5_err_t
+_h5t_search_td2 (
+	h5_file_t * const f,
+	h5_id_t face,
+	h5_id_t eid,
+	h5_td_entry_t **entry
+	) {
+	h5t_fdata_t *t = f->t;
+	h5t_adjacencies_t *a = &f->t->adjacencies;
+	void *__retval;
+
+	TRY ( *entry = _h5_calloc ( f, 1, sizeof(**entry) ) );
+
+	TRY ( h5t_get_local_vids_of_triangle2 (
+		f,
+		face,
+		eid,
+		(*entry)->key.vids ) );
+	/*
+	  resize hash table if more than 3/4 filled
+	*/
+	if ( (a->td_hash.size*6) <= (a->td_hash.filled<<3) ) {
+		h5_id_t num_elems = t->num_elems[t->num_levels-1];
+		TRY ( _h5_hresize_r (
+			      f,
+			      3*(num_elems-eid),
+			      &a->td_hash ) );
+	}
+
+	TRY ( _h5_hsearch_r (
+		      f,
+		      *entry,
+		      H5_ENTER,
+		      &__retval,
+		      &a->td_hash ) );
+	h5_td_entry_t *retval = (h5_td_entry_t *)__retval;
+	TRY ( _h5_search_idlist (
+		      f,
+		      &retval->value,
+		      _h5t_build_triangle_id ( face, eid ) ) );
+	if ( retval->value.num_items > 1 ) {
+		TRY ( _h5_free ( f, *entry ) );
+	}
+	return H5_SUCCESS;
+}
+
+h5_err_t
+_h5t_find_td (
+	h5_file_t * const f,
+	h5_td_entry_t *item,
+	h5_td_entry_t **retval
+	) {
+	void *__ret;
+	_h5_hsearch_r (
+		      f,
+		      item,
+		      H5_FIND,
+		      &__ret,
+		      &f->t->adjacencies.td_hash );
+	if ( __ret == NULL ) {
+		return _h5t_error_local_triangle_nexist( f, item->key.vids );
+	}
+	*retval = (h5_td_entry_t *)__ret;
+	return H5_SUCCESS;
+}
+
+h5_err_t
+_h5t_find_td2 (
+	h5_file_t * const f,
+	h5_id_t face_id,
+	h5_id_t local_eid,
+	h5_td_entry_t **retval
+	) {
+	h5_td_entry_t item;
+	TRY ( h5t_get_local_vids_of_triangle2 (
+		f,
+		face_id,
+		local_eid,
+		item.key.vids ) );
+	return _h5t_find_td ( f, &item, retval );
+}
diff --git a/src/h5_core/h5t_hsearch_private.h b/src/h5_core/h5t_hsearch_private.h
new file mode 100644
index 0000000..ef292f4
--- /dev/null
+++ b/src/h5_core/h5t_hsearch_private.h
@@ -0,0 +1,75 @@
+#ifndef __H5T_HSEARCH_PRIVATE_H
+#define __H5T_HSEARCH_PRIVATE_H
+
+h5_err_t
+_h5t_create_te_htab (
+	h5_file_t * const f,
+	size_t nel
+	);
+
+h5_err_t
+_h5t_resize_te_htab (
+	h5_file_t * const f,
+	size_t nel
+	);
+
+h5_err_t
+_h5t_search_te2 (
+	h5_file_t * const f,
+	h5_id_t face_id,
+	h5_id_t local_eid,
+	h5_te_entry_t **entry
+	);
+
+h5_err_t
+_h5t_find_te (
+	h5_file_t * const f,
+	h5_te_entry_t *item,
+	h5_te_entry_t **retval
+	);
+
+h5_err_t
+_h5t_find_te2 (
+	h5_file_t * const f,
+	h5_id_t face_id,
+	h5_id_t local_eid,
+	h5_te_entry_t **retval
+	);
+
+
+h5_err_t
+_h5t_create_td_htab (
+	h5_file_t * const f,
+	size_t nel
+	);
+
+h5_err_t
+_h5t_resize_td_htab (
+	h5_file_t * const f,
+	size_t nel
+	);
+
+h5_err_t
+_h5t_search_td2 (
+	h5_file_t * const f,
+	h5_id_t face_id,
+	h5_id_t local_eid,
+	h5_td_entry_t **entry
+	);
+
+h5_err_t
+_h5t_find_td (
+	h5_file_t * const f,
+	h5_td_entry_t *item,
+	h5_td_entry_t **retval
+	);
+
+h5_err_t
+_h5t_find_td2 (
+	h5_file_t * const f,
+	h5_id_t face_id,
+	h5_id_t local_eid,
+	h5_td_entry_t **rentry
+	);
+
+#endif