Use new decl-api
supply decl-api client