[RDT] Refactoring RTD