master: Updated Generator for CLI and Settings