Use new-style format