Just wanted to second what nickswalker said. Please use caution mapping things that are going to happen in the future as a user could easily misinterpret these and they do not reflect the "ground truth" best practice. Appreciate the work that went into these updates, but perhaps they can be made after the actual service change is implemented next time.