Add and adjust for raster-store.