Refactor - findOrCreatePlugin