Working on the plugin itself