Refactored for changes in HyperExpress: Expansion and ExpansionCallback.