[wdr] Modernize