Changed the plugin handler