Changes for new variable structure in TC