Add TS tracking
Merge Elizacats TS tracking pull request