Use new accessor format