Finish DataGrid support