Updated couchbase adapter