Add country and state columns for compatibility with analysis scripts.