[TASK] Improve TS