I was expecting to see the Echelons in this file also - will they be added?

Sounds like we definitely need to add Exercise & Simulation somewhere (either the name and/or tags) - to me personally that "reality" dimension isn't all that necessary/meaningful, but your call.