Updated Grid behavior to match the Framework changes