Moved specific code for JustGen into the plugin