Added more countries, energy, university etc
Updated to latest version from generate payload output