Use new Api definition