Uniformized the local generator options and the global options