FLUID-4907: Modified the auxiliary builder to simplify the expander function and improve the output schema.