Optimize country lookup by by using a dictionary for faster access and improve null handling in country retrieval methods