Improve plugin interface