Add ThermalExpansion support