Added support for generator-dependent options