Added datagrid and associated logic for data sources