-hashtable_t * ht_alloc (const datatype_t *key_type);
-uint64_t ht_cas (hashtable_t *ht, void *key, uint64_t expected_val, uint64_t val);
-uint64_t ht_get (hashtable_t *ht, void *key);
-uint64_t ht_remove (hashtable_t *ht, void *key);
-uint64_t ht_count (hashtable_t *ht);
-void ht_print (hashtable_t *ht);
-void ht_free (hashtable_t *ht);
+hashtable_t * ht_alloc (const datatype_t *key_type);
+map_val_t ht_cas (hashtable_t *ht, map_key_t key, map_val_t expected_val, map_val_t val);
+map_val_t ht_get (hashtable_t *ht, map_key_t key);
+map_val_t ht_remove (hashtable_t *ht, map_key_t key);
+size_t ht_count (hashtable_t *ht);
+void ht_print (hashtable_t *ht, int verbose);
+void ht_free (hashtable_t *ht);
+ht_iter_t * ht_iter_begin (hashtable_t *ht, map_key_t key);
+map_val_t ht_iter_next (ht_iter_t *iter, map_key_t *key_ptr);
+void ht_iter_free (ht_iter_t *iter);