Updating our config and removing the DataGrid config