I changed the plugin architecture