Added expand flags to grid