Added multi-geo support