LPS-32470.

Add Expando to the Structure and Template.