Update code according to last couch base plugin changes