Switch app to CAPI v2