Added more to Raster class