Improve use as global plugin.