[FJJ] - Add some features for datagrid