Modifying structure of the plugin