UPdated to work with Couchndoe 2.0.0-Beta