Changes to dfs data structure
New df data structure