[TASK] Various TCA improvements to ease data input