Improve country code validation