Adding TOR support inside CDRs