diff --git a/.gitignore b/.gitignore
index 8d251dd..afa07c1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,4 @@ npm-debug.log
 build/
 node_modules/
 
+.idea
\ No newline at end of file
diff --git a/binding.gyp b/binding.gyp
index 921c42c..35bd721 100644
--- a/binding.gyp
+++ b/binding.gyp
@@ -1,7 +1,7 @@
 {
   'targets': [
     {
-      'target_name': 'binding',
+      'target_name': 'xpc-connection',
       'conditions': [
         ['OS=="mac"', {
           'sources': [
@@ -25,4 +25,4 @@
         ]
     }
   ]
-}
\ No newline at end of file
+}
diff --git a/index.js b/index.js
index e331a80..9a3c0c5 100644
--- a/index.js
+++ b/index.js
@@ -1,6 +1,6 @@
 var events = require('events');
 
-var binding = require('./build/Release/binding.node');
+var binding = require('bindings')('xpc-connection.node');
 var XpcConnection = binding.XpcConnection;
 
 inherits(XpcConnection, events.EventEmitter);
diff --git a/package.json b/package.json
index 0d65f21..10642e4 100644
--- a/package.json
+++ b/package.json
@@ -25,6 +25,7 @@
     "darwin"
   ],
   "dependencies": {
+    "bindings": "~1.3.0",
     "nan": "^2.4.0"
   }
 }
diff --git a/src/XpcConnection.cpp b/src/XpcConnection.cpp
index 480e1a6..1e9ad15 100644
--- a/src/XpcConnection.cpp
+++ b/src/XpcConnection.cpp
@@ -23,12 +23,13 @@ NAN_MODULE_INIT(XpcConnection::Init) {
   Nan::SetPrototypeMethod(tmpl, "setup", Setup);
   Nan::SetPrototypeMethod(tmpl, "sendMessage", SendMessage);
 
-  target->Set(Nan::New("XpcConnection").ToLocalChecked(), tmpl->GetFunction());
+  Nan::Set(target, Nan::New("XpcConnection").ToLocalChecked(), Nan::GetFunction(tmpl).ToLocalChecked());
 }
 
 XpcConnection::XpcConnection(std::string serviceName) :
   node::ObjectWrap(),
-  serviceName(serviceName) {
+  serviceName(serviceName),
+  asyncResource("XpcConnection") {
 
   this->asyncHandle = new uv_async_t;
 
@@ -100,7 +101,7 @@ xpc_object_t XpcConnection::ValueToXpcObject(Local<Value> value) {
   xpc_object_t xpcObject = NULL;
 
   if (value->IsInt32() || value->IsUint32()) {
-    xpcObject = xpc_int64_create(value->IntegerValue());
+    xpcObject = xpc_int64_create(Nan::To<int64_t>(value).FromJust());
   } else if (value->IsString()) {
     Nan::Utf8String valueString(value);
 
@@ -110,9 +111,10 @@ xpc_object_t XpcConnection::ValueToXpcObject(Local<Value> value) {
 
     xpcObject = XpcConnection::ArrayToXpcObject(valueArray);
   } else if (node::Buffer::HasInstance(value)) {
-    Local<Object> valueObject = value->ToObject();
+    Local<Object> valueObject = Nan::To<Object>(value).ToLocalChecked();
 
-    if (valueObject->HasRealNamedProperty(Nan::New("isUuid").ToLocalChecked())) {
+
+    if (Nan::HasRealNamedProperty(valueObject, Nan::New("isUuid").ToLocalChecked()).FromJust()) {
       uuid_t *uuid = (uuid_t *)node::Buffer::Data(valueObject);
 
       xpcObject = xpc_uuid_create(*uuid);
@@ -120,7 +122,7 @@ xpc_object_t XpcConnection::ValueToXpcObject(Local<Value> value) {
       xpcObject = xpc_data_create(node::Buffer::Data(valueObject), node::Buffer::Length(valueObject));
     }
   } else if (value->IsObject()) {
-    Local<Object> valueObject = value->ToObject();
+    Local<Object> valueObject = Nan::To<Object>(value).ToLocalChecked();
 
     xpcObject = XpcConnection::ObjectToXpcObject(valueObject);
   } else {
@@ -132,15 +134,15 @@ xpc_object_t XpcConnection::ValueToXpcObject(Local<Value> value) {
 xpc_object_t XpcConnection::ObjectToXpcObject(Local<Object> object) {
   xpc_object_t xpcObject = xpc_dictionary_create(NULL, NULL, 0);
 
-  Local<Array> propertyNames = object->GetPropertyNames();
+  Local<Array> propertyNames = Nan::GetPropertyNames(object).ToLocalChecked();
 
   for(uint32_t i = 0; i < propertyNames->Length(); i++) {
-    Local<Value> propertyName = propertyNames->Get(i);
+    Local<Value> propertyName = Nan::Get(propertyNames, i).ToLocalChecked();
 
     if (propertyName->IsString()) {
       Nan::Utf8String propertyNameString(propertyName);
 
-      Local<Value> propertyValue = object->GetRealNamedProperty(propertyName->ToString());
+      Local<Value> propertyValue = Nan::GetRealNamedProperty(object, Nan::To<String>(propertyName).ToLocalChecked()).ToLocalChecked();
 
       xpc_object_t xpcValue = XpcConnection::ValueToXpcObject(propertyValue);
       xpc_dictionary_set_value(xpcObject, *propertyNameString, xpcValue);
@@ -157,7 +159,7 @@ xpc_object_t XpcConnection::ArrayToXpcObject(Local<Array> array) {
   xpc_object_t xpcArray = xpc_array_create(NULL, 0);
 
   for(uint32_t i = 0; i < array->Length(); i++) {
-    Local<Value> value = array->Get(i);
+    Local<Value> value = Nan::Get(array, i).ToLocalChecked();
 
     xpc_object_t xpcValue = XpcConnection::ValueToXpcObject(value);
     xpc_array_append_value(xpcArray, xpcValue);
@@ -197,7 +199,7 @@ Local<Object> XpcConnection::XpcDictionaryToObject(xpc_object_t xpcDictionary) {
   Local<Object> object = Nan::New<Object>();
 
   xpc_dictionary_apply(xpcDictionary, ^bool(const char *key, xpc_object_t value) {
-    object->Set(Nan::New<String>(key).ToLocalChecked(), XpcConnection::XpcObjectToValue(value));
+    Nan::Set(object, Nan::New<String>(key).ToLocalChecked(), XpcConnection::XpcObjectToValue(value));
 
     return true;
   });
@@ -209,7 +211,7 @@ Local<Array> XpcConnection::XpcArrayToArray(xpc_object_t xpcArray) {
   Local<Array> array = Nan::New<Array>();
 
   xpc_array_apply(xpcArray, ^bool(size_t index, xpc_object_t value) {
-    array->Set(Nan::New<Number>(index), XpcConnection::XpcObjectToValue(value));
+    Nan::Set(array, Nan::New<Number>(index), XpcConnection::XpcObjectToValue(value));
 
     return true;
   });
@@ -251,7 +253,7 @@ void XpcConnection::processEventQueue() {
         Nan::New(message).ToLocalChecked()
       };
 
-      Nan::MakeCallback(Nan::New<Object>(this->This), Nan::New("emit").ToLocalChecked(), 2, argv);
+      this->asyncResource.runInAsyncScope(Nan::New<Object>(this->This), Nan::New("emit").ToLocalChecked(), 2, argv);
     } else if (eventType == XPC_TYPE_DICTIONARY) {
       Local<Object> eventObject = XpcConnection::XpcDictionaryToObject(event);
 
@@ -260,7 +262,7 @@ void XpcConnection::processEventQueue() {
         eventObject
       };
 
-      Nan::MakeCallback(Nan::New<Object>(this->This), Nan::New("emit").ToLocalChecked(), 2, argv);
+      this->asyncResource.runInAsyncScope(Nan::New<Object>(this->This), Nan::New("emit").ToLocalChecked(), 2, argv);
     }
 
     xpc_release(event);
diff --git a/src/XpcConnection.h b/src/XpcConnection.h
index 114ed58..ab98277 100644
--- a/src/XpcConnection.h
+++ b/src/XpcConnection.h
@@ -45,6 +45,7 @@ class XpcConnection : public node::ObjectWrap {
   xpc_connection_t xpcConnnection;
 
   Nan::Persistent<v8::Object> This;
+  Nan::AsyncResource asyncResource;
 
   uv_async_t* asyncHandle;
   uv_mutex_t eventQueueMutex;