Making the plugin more compatible with 3rd party plugins