Adaptation to changes in TSM V2.1