Updates to PluginBuilder