added name, type and country to the location_info. Todo: make it nicer