[TASK] Follow-up to TCA refactoring