Cleaner Plugin API
Even NEWER plugin API with updated plugins