Improve plugin.image