Makes generator tool more robust
Adds New Zealand