RDT refactor