codegen plugins are now correctly executed again.
added an optional first level options container around all places that have options.