Change attribute datagrid to the new implementation