added robust support for grid and time components