Full vendor random again
More infrastructure validation #84
Update necessary country code dependencies #84