Updated config to support maps