Finished porting to couchbase