Moving to separate tc-data loader