Adding couchdb support