Added libcouchbase changes