Added PluginManager and Servlet with constructors