Finish first version of the plugin