More changes to support multiple regions.