Removed need for CouchDb