Fix issues occurred after switching to Class based dfs dirs