Added listener and plugintest