Improvement: minimize the code in the plugin creation