CHanges to Dfs class