Added basic handling for DataGrids / Tables