COMMONS-341 Small refactoring code on AddonPluginImpl