Updated thermal expansion helper, split to two classes.