Switch to Plug for plugin management