Still integrating new couchapp version