Added country code validation