diff --git a/Mage.Sets/src/mage/cards/u/UktabiEfreet.java b/Mage.Sets/src/mage/cards/u/UktabiEfreet.java
index cbd128ac8c..8a1b05acd6 100644
--- a/Mage.Sets/src/mage/cards/u/UktabiEfreet.java
+++ b/Mage.Sets/src/mage/cards/u/UktabiEfreet.java
@@ -24,7 +24,7 @@ public final class UktabiEfreet extends CardImpl {
         this.toughness = new MageInt(4);
 
         // Cumulative upkeep {G}
-        this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{G}")));
+        this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{G}")));
     }
 
     private UktabiEfreet(final UktabiEfreet card) {
diff --git a/Mage.Sets/src/mage/cards/u/UktabiFaerie.java b/Mage.Sets/src/mage/cards/u/UktabiFaerie.java
index 54cbc59985..4aeefc2773 100644
--- a/Mage.Sets/src/mage/cards/u/UktabiFaerie.java
+++ b/Mage.Sets/src/mage/cards/u/UktabiFaerie.java
@@ -32,7 +32,7 @@ public final class UktabiFaerie extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // {3}{G}, Sacrifice Uktabi Faerie: Destroy target artifact.
-        Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl("{3}{G}"));
+        Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{3}{G}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetArtifactPermanent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/u/UktabiWildcats.java b/Mage.Sets/src/mage/cards/u/UktabiWildcats.java
index 3c0bde586f..763ed3b71f 100644
--- a/Mage.Sets/src/mage/cards/u/UktabiWildcats.java
+++ b/Mage.Sets/src/mage/cards/u/UktabiWildcats.java
@@ -45,7 +45,7 @@ public final class UktabiWildcats extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.ALL, new SetPowerToughnessSourceEffect(new PermanentsOnBattlefieldCount(filter), Duration.EndOfGame)));
         
         // {G}, Sacrifice a Forest: Regenerate Uktabi Wildcats.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new  RegenerateSourceEffect(), new ManaCostsImpl("{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new  RegenerateSourceEffect(), new ManaCostsImpl<>("{G}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledPermanent(1, 1, sacrificeFilter, true)));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldCaptive.java b/Mage.Sets/src/mage/cards/u/UlvenwaldCaptive.java
index bc813d5ac1..89ca42e3bf 100644
--- a/Mage.Sets/src/mage/cards/u/UlvenwaldCaptive.java
+++ b/Mage.Sets/src/mage/cards/u/UlvenwaldCaptive.java
@@ -38,7 +38,7 @@ public final class UlvenwaldCaptive extends CardImpl {
 
         // {5}{G}{G}: Transform Ulvenwald Captive.
         this.addAbility(new TransformAbility());
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl("{5}{G}{G}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new TransformSourceEffect(), new ManaCostsImpl<>("{5}{G}{G}")));
     }
 
     private UlvenwaldCaptive(final UlvenwaldCaptive card) {
diff --git a/Mage.Sets/src/mage/cards/u/UlvenwaldPrimordials.java b/Mage.Sets/src/mage/cards/u/UlvenwaldPrimordials.java
index d963de0208..e74217697d 100644
--- a/Mage.Sets/src/mage/cards/u/UlvenwaldPrimordials.java
+++ b/Mage.Sets/src/mage/cards/u/UlvenwaldPrimordials.java
@@ -29,7 +29,7 @@ public final class UlvenwaldPrimordials extends CardImpl {
         this.toughness = new MageInt(5);
 
         // {G}: Regenerate Ulvenwald Primordials.
-        this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl("{G}")));
+        this.addAbility(new SimpleActivatedAbility(new RegenerateSourceEffect(), new ManaCostsImpl<>("{G}")));
 
         // At the beginning of each upkeep, if a player cast two or more spells last turn, transform Ulvenwald Primordials.
         this.addAbility(new WerewolfBackTriggeredAbility());
diff --git a/Mage.Sets/src/mage/cards/u/Unburden.java b/Mage.Sets/src/mage/cards/u/Unburden.java
index 9b32c1e328..661d1f3625 100644
--- a/Mage.Sets/src/mage/cards/u/Unburden.java
+++ b/Mage.Sets/src/mage/cards/u/Unburden.java
@@ -24,7 +24,7 @@ public final class Unburden extends CardImpl {
         this.getSpellAbility().addTarget(new TargetPlayer());
         
         // Cycling {2}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private Unburden(final Unburden card) {
diff --git a/Mage.Sets/src/mage/cards/u/UnburialRites.java b/Mage.Sets/src/mage/cards/u/UnburialRites.java
index 269246ac26..34f944a611 100644
--- a/Mage.Sets/src/mage/cards/u/UnburialRites.java
+++ b/Mage.Sets/src/mage/cards/u/UnburialRites.java
@@ -25,7 +25,7 @@ public final class UnburialRites extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
 
         // Flashback {3}{W}
-        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl("{3}{W}")));
+        this.addAbility(new FlashbackAbility(this, new ManaCostsImpl<>("{3}{W}")));
     }
 
     private UnburialRites(final UnburialRites card) {
diff --git a/Mage.Sets/src/mage/cards/u/UnconventionalTactics.java b/Mage.Sets/src/mage/cards/u/UnconventionalTactics.java
index 8ee507703b..5dd0f44815 100644
--- a/Mage.Sets/src/mage/cards/u/UnconventionalTactics.java
+++ b/Mage.Sets/src/mage/cards/u/UnconventionalTactics.java
@@ -68,7 +68,7 @@ class UnconventionalTacticsTriggeredAbility extends TriggeredAbilityImpl {
     }
 
     public UnconventionalTacticsTriggeredAbility() {
-        super(Zone.GRAVEYARD, new DoIfCostPaid(new ReturnToHandSourceEffect(), new ManaCostsImpl("{W}")), false);
+        super(Zone.GRAVEYARD, new DoIfCostPaid(new ReturnToHandSourceEffect(), new ManaCostsImpl<>("{W}")), false);
     }
 
     public UnconventionalTacticsTriggeredAbility(final UnconventionalTacticsTriggeredAbility ability) {
diff --git a/Mage.Sets/src/mage/cards/u/UndeadGladiator.java b/Mage.Sets/src/mage/cards/u/UndeadGladiator.java
index 4295700d9f..5ab3069888 100644
--- a/Mage.Sets/src/mage/cards/u/UndeadGladiator.java
+++ b/Mage.Sets/src/mage/cards/u/UndeadGladiator.java
@@ -33,13 +33,13 @@ public final class UndeadGladiator extends CardImpl {
         // {1}{B}, Discard a card: Return Undead Gladiator from your graveyard to your hand. Activate this ability only during your upkeep.
         Ability ability = new ConditionalActivatedAbility(Zone.GRAVEYARD, 
                 new ReturnSourceFromGraveyardToHandEffect(), 
-                new ManaCostsImpl("{1}{B}"), 
+                new ManaCostsImpl<>("{1}{B}"), 
                 new IsStepCondition(PhaseStep.UPKEEP), null);
         ability.addCost(new DiscardCardCost());
         this.addAbility(ability);
         
         // Cycling {1}{B}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{1}{B}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{1}{B}")));
     }
 
     private UndeadGladiator(final UndeadGladiator card) {
diff --git a/Mage.Sets/src/mage/cards/u/UndeadLeotau.java b/Mage.Sets/src/mage/cards/u/UndeadLeotau.java
index 3b1c97a3f5..d2f61b9026 100644
--- a/Mage.Sets/src/mage/cards/u/UndeadLeotau.java
+++ b/Mage.Sets/src/mage/cards/u/UndeadLeotau.java
@@ -29,10 +29,10 @@ public final class UndeadLeotau extends CardImpl {
         this.toughness = new MageInt(4);
 
         // {R}: Undead Leotau gets +1/-1 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1, -1, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(+1, -1, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")));
 
         // Unearth {2}{B}
-        this.addAbility(new UnearthAbility(new ManaCostsImpl("{2}{B}")));
+        this.addAbility(new UnearthAbility(new ManaCostsImpl<>("{2}{B}")));
     }
 
     private UndeadLeotau(final UndeadLeotau card) {
diff --git a/Mage.Sets/src/mage/cards/u/UndercityInformer.java b/Mage.Sets/src/mage/cards/u/UndercityInformer.java
index 2083f93618..ba42e5dc81 100644
--- a/Mage.Sets/src/mage/cards/u/UndercityInformer.java
+++ b/Mage.Sets/src/mage/cards/u/UndercityInformer.java
@@ -38,7 +38,7 @@ public final class UndercityInformer extends CardImpl {
         this.toughness = new MageInt(3);
 
         //{1}, Sacrifice a creature: Target player reveals the top card of their library until they reveal a land card, then puts those cards into their graveyard.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UndercityInformerEffect(), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UndercityInformerEffect(), new ManaCostsImpl<>("{1}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT)));
         ability.addTarget(new TargetPlayer());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/u/UnderhandedDesigns.java b/Mage.Sets/src/mage/cards/u/UnderhandedDesigns.java
index b97e28b518..70414fcf04 100644
--- a/Mage.Sets/src/mage/cards/u/UnderhandedDesigns.java
+++ b/Mage.Sets/src/mage/cards/u/UnderhandedDesigns.java
@@ -41,7 +41,7 @@ public final class UnderhandedDesigns extends CardImpl {
         // {1}{B}, Sacrifice Underhanded Designs: Destroy target creature. Activate this ability only if you control two or more artifacts.
         Ability ability = new ActivateIfConditionActivatedAbility(Zone.BATTLEFIELD,
                 new DestroyTargetEffect(),
-                new ManaCostsImpl("{1}{B}"),
+                new ManaCostsImpl<>("{1}{B}"),
                 new PermanentsOnTheBattlefieldCondition(new FilterControlledArtifactPermanent("you control two or more artifacts"), ComparisonType.MORE_THAN, 1));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
diff --git a/Mage.Sets/src/mage/cards/u/UnderworldCoinsmith.java b/Mage.Sets/src/mage/cards/u/UnderworldCoinsmith.java
index d2a28d9f50..253d23c489 100644
--- a/Mage.Sets/src/mage/cards/u/UnderworldCoinsmith.java
+++ b/Mage.Sets/src/mage/cards/u/UnderworldCoinsmith.java
@@ -33,7 +33,7 @@ public final class UnderworldCoinsmith extends CardImpl {
         // Constellation - Whenever Underworld Coinsmith or an enchantment enters the battlefield under your control, you gain 1 life.
         this.addAbility(new ConstellationAbility(new GainLifeEffect(1)));
         // {W}{B}, Pay 1 life: Each opponent loses 1 life.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(1), new ManaCostsImpl("{W}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeOpponentsEffect(1), new ManaCostsImpl<>("{W}{B}"));
         ability.addCost(new PayLifeCost(1));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/u/Unearth.java b/Mage.Sets/src/mage/cards/u/Unearth.java
index a764d042f4..1126a0aaa8 100644
--- a/Mage.Sets/src/mage/cards/u/Unearth.java
+++ b/Mage.Sets/src/mage/cards/u/Unearth.java
@@ -35,7 +35,7 @@ public final class Unearth extends CardImpl {
         this.getSpellAbility().addTarget(new TargetCardInYourGraveyard(filter));
 
         // Cycling {2}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private Unearth(final Unearth card) {
diff --git a/Mage.Sets/src/mage/cards/u/UnfulfilledDesires.java b/Mage.Sets/src/mage/cards/u/UnfulfilledDesires.java
index abf5fa07c6..5634eb4d82 100644
--- a/Mage.Sets/src/mage/cards/u/UnfulfilledDesires.java
+++ b/Mage.Sets/src/mage/cards/u/UnfulfilledDesires.java
@@ -22,7 +22,7 @@ public final class UnfulfilledDesires extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{1}{U}{B}");
 
         // {1}, Pay 1 life: Draw a card, then discard a card.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{1}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}"));
         ability.addCost(new PayLifeCost(1));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/u/UnifyingTheory.java b/Mage.Sets/src/mage/cards/u/UnifyingTheory.java
index 6b417c9430..389eb52472 100644
--- a/Mage.Sets/src/mage/cards/u/UnifyingTheory.java
+++ b/Mage.Sets/src/mage/cards/u/UnifyingTheory.java
@@ -63,7 +63,7 @@ class UnifyingTheoryEffect extends OneShotEffect {
         Player caster = game.getPlayer(targetPointer.getFirst(game, source));
         if (caster != null) {
             if (caster.chooseUse(Outcome.DrawCard, "Pay {2} to draw a card?", source, game)) {
-                Cost cost = new ManaCostsImpl("{2}");
+                Cost cost = new ManaCostsImpl<>("{2}");
                 if (cost.pay(source, game, source, caster.getId(), false, null)) {
                     caster.drawCards(1, source, game);
                 }
diff --git a/Mage.Sets/src/mage/cards/u/UnlikelyAlliance.java b/Mage.Sets/src/mage/cards/u/UnlikelyAlliance.java
index ab672150d9..eccf5ab525 100644
--- a/Mage.Sets/src/mage/cards/u/UnlikelyAlliance.java
+++ b/Mage.Sets/src/mage/cards/u/UnlikelyAlliance.java
@@ -34,7 +34,7 @@ public final class UnlikelyAlliance extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ENCHANTMENT}, "{1}{W}");
 
         // {1}{W}: Target nonattacking, nonblocking creature gets +0/+2 until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl("{1}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(0, 2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/u/UnpredictableCyclone.java b/Mage.Sets/src/mage/cards/u/UnpredictableCyclone.java
index 7e0765339f..16326a7f7d 100644
--- a/Mage.Sets/src/mage/cards/u/UnpredictableCyclone.java
+++ b/Mage.Sets/src/mage/cards/u/UnpredictableCyclone.java
@@ -30,7 +30,7 @@ public final class UnpredictableCyclone extends CardImpl {
         this.addAbility(new SimpleStaticAbility(new UnpredictableCycloneReplacementEffect()));
 
         // Cycling {2}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private UnpredictableCyclone(final UnpredictableCyclone card) {
diff --git a/Mage.Sets/src/mage/cards/u/UnravelingMummy.java b/Mage.Sets/src/mage/cards/u/UnravelingMummy.java
index 2cf49c9987..952c3bee90 100644
--- a/Mage.Sets/src/mage/cards/u/UnravelingMummy.java
+++ b/Mage.Sets/src/mage/cards/u/UnravelingMummy.java
@@ -43,14 +43,14 @@ public final class UnravelingMummy extends CardImpl {
         // {1}{W}: Target attacking Zombie gains lifelink until end of turn.
         Effect effect = new GainAbilityTargetEffect(LifelinkAbility.getInstance(), Duration.EndOfTurn);
         effect.setText("Target attacking Zombie gains lifelink until end of turn.");
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{W}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
 
         // {1}{B}: Target attacking Zombie gains deathtouch until end of turn.
         effect = new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn);
         effect.setText("Target attacking Zombie gains deathtouch until end of turn. <i>(Any amount of damage it deals to a creature is enough to destroy it.)</i>");
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{B}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{B}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
 
diff --git a/Mage.Sets/src/mage/cards/u/UnrulySureshot.java b/Mage.Sets/src/mage/cards/u/UnrulySureshot.java
index 63cc5f214c..0f00311750 100644
--- a/Mage.Sets/src/mage/cards/u/UnrulySureshot.java
+++ b/Mage.Sets/src/mage/cards/u/UnrulySureshot.java
@@ -44,7 +44,7 @@ public final class UnrulySureshot extends CardImpl {
         this.addAbility(ability);
 
         // {3}{R}: Unruly Sureshot deals 2 damage to target creature with a bounty counter on it.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl("{3}{R}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2), new ManaCostsImpl<>("{3}{R}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/u/UnseenWalker.java b/Mage.Sets/src/mage/cards/u/UnseenWalker.java
index 7e9ebd8dc1..4ccc2ad0e3 100644
--- a/Mage.Sets/src/mage/cards/u/UnseenWalker.java
+++ b/Mage.Sets/src/mage/cards/u/UnseenWalker.java
@@ -35,7 +35,7 @@ public final class UnseenWalker extends CardImpl {
         // {1}{G}{G}: Target creature gains forestwalk until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, 
                 new GainAbilityTargetEffect(new ForestwalkAbility(false), Duration.EndOfTurn), 
-                new ManaCostsImpl("{1}{G}{G}"));
+                new ManaCostsImpl<>("{1}{G}{G}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/u/UnstableHulk.java b/Mage.Sets/src/mage/cards/u/UnstableHulk.java
index 3725e0cf6f..ad26fa347b 100644
--- a/Mage.Sets/src/mage/cards/u/UnstableHulk.java
+++ b/Mage.Sets/src/mage/cards/u/UnstableHulk.java
@@ -33,7 +33,7 @@ public final class UnstableHulk extends CardImpl {
         this.toughness = new MageInt(2);
 
         // Morph {3}{R}{R} 
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{R}{R}")));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{R}{R}")));
     
         //When Unstable Hulk is turned face up, it gets +6/+6 and gains trample until end of turn. You skip your next turn.
         Effect effect = new GainAbilitySourceEffect(TrampleAbility.getInstance(), Duration.EndOfTurn);
diff --git a/Mage.Sets/src/mage/cards/u/UnwaveringInitiate.java b/Mage.Sets/src/mage/cards/u/UnwaveringInitiate.java
index 2e1f3e1cd4..f3f639cc70 100644
--- a/Mage.Sets/src/mage/cards/u/UnwaveringInitiate.java
+++ b/Mage.Sets/src/mage/cards/u/UnwaveringInitiate.java
@@ -29,7 +29,7 @@ public final class UnwaveringInitiate extends CardImpl {
         this.addAbility(VigilanceAbility.getInstance());
 
         // Embalm {4}{W}
-        this.addAbility(new EmbalmAbility(new ManaCostsImpl("{4}{W}"), this));
+        this.addAbility(new EmbalmAbility(new ManaCostsImpl<>("{4}{W}"), this));
     }
 
     private UnwaveringInitiate(final UnwaveringInitiate card) {
diff --git a/Mage.Sets/src/mage/cards/u/UnwillingIngredient.java b/Mage.Sets/src/mage/cards/u/UnwillingIngredient.java
index a8a75e2d28..26c0be437a 100644
--- a/Mage.Sets/src/mage/cards/u/UnwillingIngredient.java
+++ b/Mage.Sets/src/mage/cards/u/UnwillingIngredient.java
@@ -36,7 +36,7 @@ public final class UnwillingIngredient extends CardImpl {
                 Zone.GRAVEYARD,
                 new DrawCardSourceControllerEffect(1)
                         .setText("you draw a card"),
-                new ManaCostsImpl("{2}{B}")
+                new ManaCostsImpl<>("{2}{B}")
         );
         ability.addEffect(new LoseLifeSourceControllerEffect(1).concatBy("and"));
         ability.addCost(new ExileSourceFromGraveCost());
diff --git a/Mage.Sets/src/mage/cards/u/UnworthyDead.java b/Mage.Sets/src/mage/cards/u/UnworthyDead.java
index a6acfbdc4b..1227d9fd53 100644
--- a/Mage.Sets/src/mage/cards/u/UnworthyDead.java
+++ b/Mage.Sets/src/mage/cards/u/UnworthyDead.java
@@ -26,7 +26,7 @@ public final class UnworthyDead extends CardImpl {
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")));
     }
 
     private UnworthyDead(final UnworthyDead card) {
diff --git a/Mage.Sets/src/mage/cards/u/UnyaroBees.java b/Mage.Sets/src/mage/cards/u/UnyaroBees.java
index d797d3087f..8c982c0510 100644
--- a/Mage.Sets/src/mage/cards/u/UnyaroBees.java
+++ b/Mage.Sets/src/mage/cards/u/UnyaroBees.java
@@ -33,9 +33,9 @@ public final class UnyaroBees extends CardImpl {
         // Flying
         this.addAbility(FlyingAbility.getInstance());
         // {G}: Unyaro Bees gets +1/+1 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl("{G}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 1, Duration.EndOfTurn), new ManaCostsImpl<>("{G}")));
         // {3}{G}, Sacrifice Unyaro Bees: Unyaro Bees deals 2 damage to any target.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl("{3}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(2, "it"), new ManaCostsImpl<>("{3}{G}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetAnyTarget());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/u/UnyieldingKrumar.java b/Mage.Sets/src/mage/cards/u/UnyieldingKrumar.java
index cf9f291dbd..d77ad4bc2a 100644
--- a/Mage.Sets/src/mage/cards/u/UnyieldingKrumar.java
+++ b/Mage.Sets/src/mage/cards/u/UnyieldingKrumar.java
@@ -29,7 +29,7 @@ public final class UnyieldingKrumar extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {1}{W}: Unyielding Krumar gains first strike until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{W}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{W}")));
 
     }
 
diff --git a/Mage.Sets/src/mage/cards/u/UrborgMindsucker.java b/Mage.Sets/src/mage/cards/u/UrborgMindsucker.java
index ebb2de2759..aa5b138bbc 100644
--- a/Mage.Sets/src/mage/cards/u/UrborgMindsucker.java
+++ b/Mage.Sets/src/mage/cards/u/UrborgMindsucker.java
@@ -28,7 +28,7 @@ public final class UrborgMindsucker extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {B}, Sacrifice Urborg Mindsucker: Target opponent discards a card at random. Activate this ability only any time you could cast a sorcery.
-        Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1, true), new ManaCostsImpl("{B}"));
+        Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new DiscardTargetEffect(1, true), new ManaCostsImpl<>("{B}"));
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/u/UrborgPhantom.java b/Mage.Sets/src/mage/cards/u/UrborgPhantom.java
index 9acb0f03d3..2bde44a892 100644
--- a/Mage.Sets/src/mage/cards/u/UrborgPhantom.java
+++ b/Mage.Sets/src/mage/cards/u/UrborgPhantom.java
@@ -35,7 +35,7 @@ public final class UrborgPhantom extends CardImpl {
         // {U}: Prevent all combat damage that would be dealt to and dealt by Urborg Phantom this turn.
         Effect effect = new PreventCombatDamageToSourceEffect(Duration.EndOfTurn);
         effect.setText("Prevent all combat damage that would be dealt to");
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{U}"));
         effect = new PreventCombatDamageBySourceEffect(Duration.EndOfTurn);
         effect.setText("and dealt by {this} this turn");
         ability.addEffect(effect);
diff --git a/Mage.Sets/src/mage/cards/u/UrborgSkeleton.java b/Mage.Sets/src/mage/cards/u/UrborgSkeleton.java
index 189855b6e2..4eb633743c 100644
--- a/Mage.Sets/src/mage/cards/u/UrborgSkeleton.java
+++ b/Mage.Sets/src/mage/cards/u/UrborgSkeleton.java
@@ -37,7 +37,7 @@ public final class UrborgSkeleton extends CardImpl {
         this.addAbility(new KickerAbility("{3}"));
 
         // {B}: Regenerate Urborg Skeleton.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{B}")));
 
         // If Urborg Skeleton was kicked, it enters the battlefield with a +1/+1 counter on it.
         Ability ability = new EntersBattlefieldAbility(
diff --git a/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java b/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java
index ebf49013d1..3ab33db53e 100644
--- a/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java
+++ b/Mage.Sets/src/mage/cards/u/UrborgSyphonMage.java
@@ -33,7 +33,7 @@ public final class UrborgSyphonMage extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {2}{B}, {tap}, Discard a card: Each other player loses 2 life. You gain life equal to the life lost this way.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrborgSyphonMageEffect(), new ManaCostsImpl("{2}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrborgSyphonMageEffect(), new ManaCostsImpl<>("{2}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new DiscardCardCost());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/u/UrsineChampion.java b/Mage.Sets/src/mage/cards/u/UrsineChampion.java
index bf4f6de36f..429d3afeff 100644
--- a/Mage.Sets/src/mage/cards/u/UrsineChampion.java
+++ b/Mage.Sets/src/mage/cards/u/UrsineChampion.java
@@ -32,7 +32,7 @@ public final class UrsineChampion extends CardImpl {
                 Zone.BATTLEFIELD,
                 new BoostSourceEffect(3, 3, Duration.EndOfTurn)
                         .setText("{this} gets +3/+3"),
-                new ManaCostsImpl("{5}{G}")
+                new ManaCostsImpl<>("{5}{G}")
         );
         ability.addEffect(new UrsineChampionEffect());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/u/UrsineFylgja.java b/Mage.Sets/src/mage/cards/u/UrsineFylgja.java
index 8304654f94..5af1256df3 100644
--- a/Mage.Sets/src/mage/cards/u/UrsineFylgja.java
+++ b/Mage.Sets/src/mage/cards/u/UrsineFylgja.java
@@ -40,7 +40,7 @@ public final class UrsineFylgja extends CardImpl {
             new RemoveCountersSourceCost(CounterType.HEALING.createInstance(1))));
         // {2}{W}: Put a healing counter on Ursine Fylgja.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new AddCountersSourceEffect(CounterType.HEALING.createInstance(1)),
-            new ManaCostsImpl("{2}{W}")));
+            new ManaCostsImpl<>("{2}{W}")));
     }
 
     private UrsineFylgja(final UrsineFylgja card) {
diff --git a/Mage.Sets/src/mage/cards/u/UrzasAvenger.java b/Mage.Sets/src/mage/cards/u/UrzasAvenger.java
index 5dd53fa018..49d2734290 100644
--- a/Mage.Sets/src/mage/cards/u/UrzasAvenger.java
+++ b/Mage.Sets/src/mage/cards/u/UrzasAvenger.java
@@ -37,7 +37,7 @@ public final class UrzasAvenger extends CardImpl {
         this.toughness = new MageInt(4);
 
         // {0}: Urza's Avenger gets -1/-1 and gains your choice of banding, flying, first strike, or trample until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasAvengerEffect(), new ManaCostsImpl("{0}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasAvengerEffect(), new ManaCostsImpl<>("{0}")));
     }
 
     private UrzasAvenger(final UrzasAvenger card) {
diff --git a/Mage.Sets/src/mage/cards/u/UrzasEngine.java b/Mage.Sets/src/mage/cards/u/UrzasEngine.java
index 11a324795e..50c408df9f 100644
--- a/Mage.Sets/src/mage/cards/u/UrzasEngine.java
+++ b/Mage.Sets/src/mage/cards/u/UrzasEngine.java
@@ -37,10 +37,10 @@ public final class UrzasEngine extends CardImpl {
         this.addAbility(TrampleAbility.getInstance());
 
         // {3}: Urza's Engine gains banding until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{3}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(BandingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{3}")));
 
         // {3}: Attacking creatures banded with Urza's Engine gain trample until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasEngineEffect(), new ManaCostsImpl("{3}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasEngineEffect(), new ManaCostsImpl<>("{3}")));
     }
 
     public UrzasEngine(final UrzasEngine card) {
diff --git a/Mage.Sets/src/mage/cards/u/UrzasHotTub.java b/Mage.Sets/src/mage/cards/u/UrzasHotTub.java
index 57b1c8ada0..2672f1ddba 100644
--- a/Mage.Sets/src/mage/cards/u/UrzasHotTub.java
+++ b/Mage.Sets/src/mage/cards/u/UrzasHotTub.java
@@ -31,7 +31,7 @@ public class UrzasHotTub extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}");
 
         // {2}, Discard a card: Search your library for a card that shares a complete word in its name with the discarded card, reveal it, put it into your hand, then shuffle your library.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasHotTubEffect(), new ManaCostsImpl("{2}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UrzasHotTubEffect(), new ManaCostsImpl<>("{2}"));
         ability.addCost(new DiscardTargetCost(new TargetCardInHand()));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/u/UthdenTroll.java b/Mage.Sets/src/mage/cards/u/UthdenTroll.java
index e01558559a..06c7f36bae 100644
--- a/Mage.Sets/src/mage/cards/u/UthdenTroll.java
+++ b/Mage.Sets/src/mage/cards/u/UthdenTroll.java
@@ -26,7 +26,7 @@ public final class UthdenTroll extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {R}: Regenerate Uthden Troll.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{R}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{R}")));
     }
 
     private UthdenTroll(final UthdenTroll card) {