Convert to new TRDS 3.0