Reorganized Generator options.