Add mroe TrialData support