Updated the plugin to the new structure