More TR class adjustments for expansion changes