Enhancement: More base layers
Bug: Fixed scoping issue for clip operations in both raster classes