Improve the couchbase implementation.