diff --git a/common.go b/common.go
index 6f55639..fdea914 100644
--- a/common.go
+++ b/common.go
@@ -178,6 +178,8 @@ const (
 	PoolPropTName
 	PoolPropMaxNodeSize
 	PoolPropMultiHost
+	PoolPropCheckpoint
+	PoolPropLoadGuid
 	PoolNumProps
 )
 
diff --git a/sendrecv.go b/sendrecv.go
index f57d82e..c4003c2 100644
--- a/sendrecv.go
+++ b/sendrecv.go
@@ -131,7 +131,7 @@ func (d *Dataset) send(FromName string, outf *os.File, flags *SendFlags) (err er
 func (d *Dataset) SendOne(FromName string, outf *os.File, flags *SendFlags) (err error) {
 	var cfromname, ctoname *C.char
 	var dpath string
-	var lzc_send_flags uint32
+	var lzc_send_flags C.struct_sendflags
 
 	if d.Type == DatasetTypeSnapshot || (len(FromName) > 0 && !strings.Contains(FromName, "#")) {
 		err = fmt.Errorf(
@@ -144,10 +144,10 @@ func (d *Dataset) SendOne(FromName string, outf *os.File, flags *SendFlags) (err
 	}
 
 	if flags.LargeBlock {
-		lzc_send_flags |= C.LZC_SEND_FLAG_LARGE_BLOCK
+		lzc_send_flags.largeblock = booleanT(true)
 	}
 	if flags.EmbedData {
-		lzc_send_flags |= C.LZC_SEND_FLAG_EMBED_DATA
+		lzc_send_flags.embed_data = booleanT(true)
 	}
 	// if (flags.Compress)
 	// 	lzc_send_flags |= LZC_SEND_FLAG_COMPRESS;
diff --git a/zpool.c b/zpool.c
index 4f91e27..b4dc9a1 100644
--- a/zpool.c
+++ b/zpool.c
@@ -6,6 +6,8 @@ typedef unsigned long int rlim64_t;
 
 #include <libzfs.h>
 #include <libzfs/sys/zfs_context.h>
+#include <libzutil.h>
+#include <thread_pool.h>
 
 #include <memory.h>
 #include <string.h>
@@ -79,11 +81,11 @@ char *sZPOOL_CONFIG_DEGRADED = ZPOOL_CONFIG_DEGRADED;
 char *sZPOOL_CONFIG_REMOVED = ZPOOL_CONFIG_REMOVED;
 char *sZPOOL_CONFIG_FRU = ZPOOL_CONFIG_FRU;
 char *sZPOOL_CONFIG_AUX_STATE = ZPOOL_CONFIG_AUX_STATE;
-char *sZPOOL_REWIND_POLICY = ZPOOL_REWIND_POLICY;
-char *sZPOOL_REWIND_REQUEST = ZPOOL_REWIND_REQUEST;
-char *sZPOOL_REWIND_REQUEST_TXG = ZPOOL_REWIND_REQUEST_TXG;
-char *sZPOOL_REWIND_META_THRESH = ZPOOL_REWIND_META_THRESH;
-char *sZPOOL_REWIND_DATA_THRESH = ZPOOL_REWIND_DATA_THRESH;
+char *sZPOOL_LOAD_POLICY = ZPOOL_LOAD_POLICY;
+char *sZPOOL_LOAD_REWIND_POLICY = ZPOOL_LOAD_REWIND_POLICY;
+char *sZPOOL_LOAD_REQUEST_TXG = ZPOOL_LOAD_REQUEST_TXG;
+char *sZPOOL_LOAD_META_THRESH = ZPOOL_LOAD_META_THRESH;
+char *sZPOOL_LOAD_DATA_THRESH = ZPOOL_LOAD_DATA_THRESH;
 char *sZPOOL_CONFIG_LOAD_TIME = ZPOOL_CONFIG_LOAD_TIME;
 char *sZPOOL_CONFIG_LOAD_DATA_ERRORS = ZPOOL_CONFIG_LOAD_DATA_ERRORS;
 char *sZPOOL_CONFIG_REWIND_TIME = ZPOOL_CONFIG_REWIND_TIME;
@@ -216,7 +218,7 @@ property_list_ptr read_append_zpool_property(zpool_list_ptr pool, property_list_
 	// printf("p: %s %s %s\n", newitem->name, newitem->value, newitem->source);
 	newitem->pnext = proot;
 	proot = newitem;
-	
+
 	return proot;
 }
 
@@ -231,24 +233,22 @@ property_list_t *read_zpool_properties(zpool_list_ptr pool) {
 	root = read_append_zpool_property(pool, root, ZPOOL_PROP_HEALTH);
 	root = read_append_zpool_property(pool, root, ZPOOL_PROP_GUID);
 	root = read_append_zpool_property(pool, root, ZPOOL_PROP_VERSION);
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_BOOTFS);	
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_DELEGATION);	
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_AUTOREPLACE);	
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_BOOTFS);
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_DELEGATION);
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_AUTOREPLACE);
 	root = read_append_zpool_property(pool, root, ZPOOL_PROP_CACHEFILE);
 	root = read_append_zpool_property(pool, root, ZPOOL_PROP_FAILUREMODE);
 	root = read_append_zpool_property(pool, root, ZPOOL_PROP_LISTSNAPS);
 	root = read_append_zpool_property(pool, root, ZPOOL_PROP_AUTOEXPAND);
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_DEDUPDITTO);	
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_DEDUPRATIO);	
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_FREE);	
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_ALLOCATED);	
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_READONLY);	
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_ASHIFT);	
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_COMMENT);	
-	root = read_append_zpool_property(pool, root, ZPOOL_PROP_EXPANDSZ);	
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_DEDUPDITTO);
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_DEDUPRATIO);
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_FREE);
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_ALLOCATED);
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_READONLY);
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_ASHIFT);
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_COMMENT);
+	root = read_append_zpool_property(pool, root, ZPOOL_PROP_EXPANDSZ);
 	root = read_append_zpool_property(pool, root, ZPOOL_PROP_FREEING);
-	
-
 
 	list = new_property_list();
 	list->property = ZPOOL_NUM_PROPS;
@@ -455,7 +455,7 @@ uint64_t get_vdev_is_log(nvlist_ptr nv) {
 }
 
 
-// return 
+// return
 uint64_t get_zpool_state(nvlist_ptr nv) {
 	uint64_t state = 0;
 	nvlist_lookup_uint64(nv, ZPOOL_CONFIG_POOL_STATE, &state);
@@ -501,18 +501,24 @@ nvlist_ptr go_zpool_search_import(libzfs_handle_ptr zfsh, int paths, char **path
 	idata.paths = paths;
 	// idata.scan = 0;
 
-	thread_init();
-	pools = zpool_search_import(zfsh, &idata);
-	thread_fini();
+	tpool_t *t;
+	t = tpool_create(1, 5 * sysconf(_SC_NPROCESSORS_ONLN), 0, NULL);
+	if (t == NULL)
+			return NULL;
+
+	pools = zpool_search_import(zfsh, &idata, &libzfs_config_ops);
+
+	tpool_wait(t);
+	tpool_destroy(t);
 	return pools;
 }
 
 
-int do_zpool_clear(zpool_list_t *pool, const char *device, u_int32_t rewind_policy) {
+int do_zpool_clear(zpool_list_t *pool, const char *device, u_int32_t load_policy) {
 	nvlist_t *policy = NULL;
 	int ret = 0;
 	if (nvlist_alloc(&policy, NV_UNIQUE_NAME, 0) != 0 ||
-	    nvlist_add_uint32(policy, ZPOOL_REWIND_REQUEST, rewind_policy) != 0)
+	    nvlist_add_uint32(policy, ZPOOL_LOAD_POLICY, load_policy) != 0)
 		return (1);
 
 	if (zpool_clear(pool->zph, device, policy) != 0)
@@ -521,4 +527,4 @@ int do_zpool_clear(zpool_list_t *pool, const char *device, u_int32_t rewind_poli
 	nvlist_free(policy);
 
 	return (ret);
-}
\ No newline at end of file
+}
diff --git a/zpool.h b/zpool.h
index 4b7808d..d46676a 100644
--- a/zpool.h
+++ b/zpool.h
@@ -149,11 +149,11 @@ extern char *sZPOOL_CONFIG_DEGRADED;
 extern char *sZPOOL_CONFIG_REMOVED;
 extern char *sZPOOL_CONFIG_FRU;
 extern char *sZPOOL_CONFIG_AUX_STATE;
-extern char *sZPOOL_REWIND_POLICY;
-extern char *sZPOOL_REWIND_REQUEST;
-extern char *sZPOOL_REWIND_REQUEST_TXG;
-extern char *sZPOOL_REWIND_META_THRESH;
-extern char *sZPOOL_REWIND_DATA_THRESH;
+extern char *sZPOOL_LOAD_POLICY;
+extern char *sZPOOL_LOAD_REWIND_POLICY;
+extern char *sZPOOL_LOAD_REQUEST_TXG;
+extern char *sZPOOL_LOAD_META_THRESH;
+extern char *sZPOOL_LOAD_DATA_THRESH;
 extern char *sZPOOL_CONFIG_LOAD_TIME;
 extern char *sZPOOL_CONFIG_LOAD_DATA_ERRORS;
 extern char *sZPOOL_CONFIG_REWIND_TIME;