Prepared for TSM V2.0 :-)
Update for TSM V2.0