Refactoring, moving plugin config options into config field.