Rework Raster types