[drtv] Modernize and make more robust