Update maps to support multiple origins