separate dfs and dfs/generic and update dag?