[TASK] Refacored TCA - Closes #1