Renabled TS support