code review, use PluginUtils