API improvements and remove disable(Plugin), enable(plugin) hack.