Working on the plugin