refact GridStore