SINF0000 even more pluginization