Improved WDC export mechanism