[TASK] Move TCA to Overrides