Use new public api