Making the plugin compatible with