Updates for Gridkit