Use new common API