LPS-32470.
Add Expando to the Structure and Template.
LPS-32470 Source formatting
LPS-32470 Add helper methods to make this easier to do in the future
LPS-32470 Regen
LPS-32470 Use new helper methods
Regen