Changes in DataGrid classes