Adding JavaDoc comments and PluginManager