Refactor payment methods plugability