Change to use SpatialTools