Started integrating pluginFactory