Refactoring of payment plugin inheritance