Added components and component-based grids