Added Thermal Expansion Compatibility