Update (minor) - working on extendable Datagrid