[WIP] Improve plugin.