Added Thermal Expansion support