Adding DWRF related stuff