Upgraded to support datagrid version 0.9.1