Added NEIPlugins support