Refactor TRDS