added a separation between PluginFilter and ClassFilter