added per component geo_map and modified arguments of function calls