Introduce improved support for raster layers