diff --git a/Mage.Sets/src/mage/cards/o/OashraCultivator.java b/Mage.Sets/src/mage/cards/o/OashraCultivator.java
index 91546dcd785..5fcb273bdc6 100644
--- a/Mage.Sets/src/mage/cards/o/OashraCultivator.java
+++ b/Mage.Sets/src/mage/cards/o/OashraCultivator.java
@@ -35,7 +35,7 @@ public final class OashraCultivator extends CardImpl {
         // {2}{G}, {T}, Sacrifice Oashra Cultivator: Search your library for a basic land card, put it onto the battlefield tapped, then shuffle your library.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new SearchLibraryPutInPlayEffect(new TargetCardInLibrary(StaticFilters.FILTER_CARD_BASIC_LAND), true),
-                new ManaCostsImpl("{2}{G}"));
+                new ManaCostsImpl<>("{2}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java
index d81ffe08b27..0741ba56085 100644
--- a/Mage.Sets/src/mage/cards/o/OathOfLimDul.java
+++ b/Mage.Sets/src/mage/cards/o/OathOfLimDul.java
@@ -37,7 +37,7 @@ public final class OathOfLimDul extends CardImpl {
         this.addAbility(new OathOfLimDulTriggeredAbility());
 
         // {B}{B}: Draw a card.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{B}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{B}{B}")));
 
     }
 
diff --git a/Mage.Sets/src/mage/cards/o/ObeliskOfAlara.java b/Mage.Sets/src/mage/cards/o/ObeliskOfAlara.java
index 1a2ae8d8d27..dfed6a949ab 100644
--- a/Mage.Sets/src/mage/cards/o/ObeliskOfAlara.java
+++ b/Mage.Sets/src/mage/cards/o/ObeliskOfAlara.java
@@ -28,25 +28,25 @@ public final class ObeliskOfAlara extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{6}");
 
         // {1}{W}, {tap}: You gain 5 life.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ManaCostsImpl("{1}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(5), new ManaCostsImpl<>("{1}{W}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
         // {1}{U}, {tap}: Draw a card, then discard a card.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl("{1}{U}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new ManaCostsImpl<>("{1}{U}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
         // {1}{B}, {tap}: Target creature gets -2/-2 until end of turn.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(-2, -2, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
         // {1}{R}, {tap}: Obelisk of Alara deals 3 damage to target player.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl("{1}{R}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DamageTargetEffect(3), new ManaCostsImpl<>("{1}{R}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetPlayerOrPlaneswalker());
         this.addAbility(ability);
         // {1}{G}, {tap}: Target creature gets +4/+4 until end of turn.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl("{1}{G}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostTargetEffect(4, 4, Duration.EndOfTurn), new ManaCostsImpl<>("{1}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java b/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java
index b2b73445d98..8a3abefa028 100644
--- a/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java
+++ b/Mage.Sets/src/mage/cards/o/ObeliskOfUndoing.java
@@ -32,7 +32,7 @@ public final class ObeliskOfUndoing extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ARTIFACT},"{1}");
 
         // {6}, {tap}: Return target permanent you both own and control to your hand.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl("{6}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnToHandTargetEffect(), new ManaCostsImpl<>("{6}"));
         ability.addCost(new TapSourceCost());        
         ability.addTarget(new TargetControlledPermanent(filter));
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/ObscuringAether.java b/Mage.Sets/src/mage/cards/o/ObscuringAether.java
index 48cb358a8ec..c72a91df644 100644
--- a/Mage.Sets/src/mage/cards/o/ObscuringAether.java
+++ b/Mage.Sets/src/mage/cards/o/ObscuringAether.java
@@ -36,7 +36,7 @@ public final class ObscuringAether extends CardImpl {
         // {1}{G}: Turn Obscuring Aether face down.
         Effect effect = new BecomesFaceDownCreatureEffect(Duration.Custom, BecomesFaceDownCreatureEffect.FaceDownType.MANUAL);
         effect.setText("Turn {this} face down. <i>(It becomes a 2/2 creature.)</i>");
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl("{1}{G}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, effect, new ManaCostsImpl<>("{1}{G}")));
 
     }
 
diff --git a/Mage.Sets/src/mage/cards/o/ObsessiveSearch.java b/Mage.Sets/src/mage/cards/o/ObsessiveSearch.java
index 971c40a788b..81d3b46426d 100644
--- a/Mage.Sets/src/mage/cards/o/ObsessiveSearch.java
+++ b/Mage.Sets/src/mage/cards/o/ObsessiveSearch.java
@@ -23,7 +23,7 @@ public final class ObsessiveSearch extends CardImpl {
         this.getSpellAbility().addEffect(new DrawCardSourceControllerEffect(1));
 
         // Madness {U}
-        this.addAbility(new MadnessAbility(new ManaCostsImpl("{U}")));
+        this.addAbility(new MadnessAbility(new ManaCostsImpl<>("{U}")));
     }
 
     private ObsessiveSearch(final ObsessiveSearch card) {
diff --git a/Mage.Sets/src/mage/cards/o/ObsessiveStitcher.java b/Mage.Sets/src/mage/cards/o/ObsessiveStitcher.java
index 53b024c014d..9ab202da26e 100644
--- a/Mage.Sets/src/mage/cards/o/ObsessiveStitcher.java
+++ b/Mage.Sets/src/mage/cards/o/ObsessiveStitcher.java
@@ -35,7 +35,7 @@ public final class ObsessiveStitcher extends CardImpl {
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawDiscardControllerEffect(), new TapSourceCost()));
 
         // {2}{U}{B}, {T}, Sacrifice Obsessive Stitcher: Return target creature card from your graveyard to the battlefield.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{2}{U}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{2}{U}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         ability.addTarget(new TargetCardInYourGraveyard(StaticFilters.FILTER_CARD_CREATURE_YOUR_GRAVEYARD));
diff --git a/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java b/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java
index 34de6f03883..4bc8022e52b 100644
--- a/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java
+++ b/Mage.Sets/src/mage/cards/o/ObsidianAcolyte.java
@@ -34,7 +34,7 @@ public final class ObsidianAcolyte extends CardImpl {
         this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
         // {W}: Target creature gains protection from black until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
-            new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.BLACK), Duration.EndOfTurn), new ManaCostsImpl("{W}"));
+            new GainAbilityTargetEffect(ProtectionAbility.from(ObjectColor.BLACK), Duration.EndOfTurn), new ManaCostsImpl<>("{W}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
 
diff --git a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java
index 94e2e86efb3..d2cf561485f 100644
--- a/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java
+++ b/Mage.Sets/src/mage/cards/o/ObsidianFireheart.java
@@ -55,7 +55,7 @@ public final class ObsidianFireheart extends CardImpl {
         // after Obsidian Fireheart has left the battlefield.)
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new AddCountersTargetEffect(CounterType.BLAZE.createInstance()),
-                new ManaCostsImpl("{1}{R}{R}"));
+                new ManaCostsImpl<>("{1}{R}{R}"));
         ability.addTarget(new TargetLandPermanent(filter));
         OneShotEffect effect = new ObsidianFireheartOneShotEffect();
         effect.setText(rule);
diff --git a/Mage.Sets/src/mage/cards/o/Occupation.java b/Mage.Sets/src/mage/cards/o/Occupation.java
index eb24b256b10..8fbb0559e97 100644
--- a/Mage.Sets/src/mage/cards/o/Occupation.java
+++ b/Mage.Sets/src/mage/cards/o/Occupation.java
@@ -34,7 +34,7 @@ public final class Occupation extends CardImpl {
         // {W}{B}: Target creature can't attack or block this turn, and its activated abilities can't be activated until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD,
                 new OccupationOneShotEffect("Target creature can't attack or block this turn, and its activated abilities can't be activated until end of turn"),
-                new ManaCostsImpl("{W}{B}"));
+                new ManaCostsImpl<>("{W}{B}"));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OcularHalo.java b/Mage.Sets/src/mage/cards/o/OcularHalo.java
index 0269e0a40f9..adfc976cdb5 100644
--- a/Mage.Sets/src/mage/cards/o/OcularHalo.java
+++ b/Mage.Sets/src/mage/cards/o/OcularHalo.java
@@ -46,7 +46,7 @@ public final class OcularHalo extends CardImpl {
         
         // {W}: Enchanted creature gains vigilance until end of turn.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityAttachedEffect(VigilanceAbility.getInstance(),
-            AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl("{W}")));
+            AttachmentType.AURA, Duration.EndOfTurn), new ManaCostsImpl<>("{W}")));
     }
 
     private OcularHalo(final OcularHalo card) {
diff --git a/Mage.Sets/src/mage/cards/o/OdiousTrow.java b/Mage.Sets/src/mage/cards/o/OdiousTrow.java
index a4cc89e243a..69a5b825228 100644
--- a/Mage.Sets/src/mage/cards/o/OdiousTrow.java
+++ b/Mage.Sets/src/mage/cards/o/OdiousTrow.java
@@ -25,7 +25,7 @@ public final class OdiousTrow extends CardImpl {
 
         this.power = new MageInt(1);
         this.toughness = new MageInt(1);
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl("{1}{B/G}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateSourceEffect(), new ManaCostsImpl<>("{1}{B/G}")));
     }
 
     private OdiousTrow(final OdiousTrow card) {
diff --git a/Mage.Sets/src/mage/cards/o/OdunosRiverTrawler.java b/Mage.Sets/src/mage/cards/o/OdunosRiverTrawler.java
index 59609003fc8..033a22895ba 100644
--- a/Mage.Sets/src/mage/cards/o/OdunosRiverTrawler.java
+++ b/Mage.Sets/src/mage/cards/o/OdunosRiverTrawler.java
@@ -41,7 +41,7 @@ public final class OdunosRiverTrawler extends CardImpl {
         ability.addTarget(new TargetCardInYourGraveyard(filter));        
         this.addAbility(ability);
         // {W}, Sacrifice Odunos River Trawler: Return target enchantment creature card from your graveyard to your hand.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl("{W}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToHandTargetEffect(), new ManaCostsImpl<>("{W}"));
         ability.addTarget(new TargetCardInYourGraveyard(filter));        
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OgreMenial.java b/Mage.Sets/src/mage/cards/o/OgreMenial.java
index e14899e7726..67377ec3872 100644
--- a/Mage.Sets/src/mage/cards/o/OgreMenial.java
+++ b/Mage.Sets/src/mage/cards/o/OgreMenial.java
@@ -31,7 +31,7 @@ public final class OgreMenial extends CardImpl {
         this.addAbility(InfectAbility.getInstance());
 
         // {R}: Ogre Menial gets +1/+0 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl("{R}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1, 0, Duration.EndOfTurn), new ManaCostsImpl<>("{R}")));
     }
 
     private OgreMenial(final OgreMenial card) {
diff --git a/Mage.Sets/src/mage/cards/o/OgreSiegebreaker.java b/Mage.Sets/src/mage/cards/o/OgreSiegebreaker.java
index b2401e88964..977fa7c5a32 100644
--- a/Mage.Sets/src/mage/cards/o/OgreSiegebreaker.java
+++ b/Mage.Sets/src/mage/cards/o/OgreSiegebreaker.java
@@ -37,7 +37,7 @@ public final class OgreSiegebreaker extends CardImpl {
         this.toughness = new MageInt(3);
 
         // {2}{B}{R}: Destroy target creature that was dealt damage this turn.
-        Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl("{2}{B}{R}"));
+        Ability ability = new SimpleActivatedAbility(new DestroyTargetEffect(), new ManaCostsImpl<>("{2}{B}{R}"));
         ability.addTarget(new TargetPermanent(filter));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OhranYeti.java b/Mage.Sets/src/mage/cards/o/OhranYeti.java
index 32cad039ede..1cb140cfa96 100644
--- a/Mage.Sets/src/mage/cards/o/OhranYeti.java
+++ b/Mage.Sets/src/mage/cards/o/OhranYeti.java
@@ -39,7 +39,7 @@ public final class OhranYeti extends CardImpl {
 
         // {2}{S}: Target snow creature gains first strike until end of turn.
         Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(
-            FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{2}{S}"));
+            FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{2}{S}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java b/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java
index 730947fa6ce..65f5264a008 100644
--- a/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java
+++ b/Mage.Sets/src/mage/cards/o/OjutaiInterceptor.java
@@ -28,7 +28,7 @@ public final class OjutaiInterceptor extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Megamorph {3}{U}
-        this.addAbility(new MorphAbility(new ManaCostsImpl("{3}{U}"), true));
+        this.addAbility(new MorphAbility(new ManaCostsImpl<>("{3}{U}"), true));
 
     }
 
diff --git a/Mage.Sets/src/mage/cards/o/OjutaiMonument.java b/Mage.Sets/src/mage/cards/o/OjutaiMonument.java
index 3a12d377990..31a42c75c49 100644
--- a/Mage.Sets/src/mage/cards/o/OjutaiMonument.java
+++ b/Mage.Sets/src/mage/cards/o/OjutaiMonument.java
@@ -32,7 +32,7 @@ public final class OjutaiMonument extends CardImpl {
         
         // {4}{W}{U}: Ojutai Monument becomes a 4/4 white and blue Dragon artifact creature with flying until end of turn.
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect
-            (new OjutaiMonumentToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{4}{W}{U}")));
+            (new OjutaiMonumentToken(), "", Duration.EndOfTurn), new ManaCostsImpl<>("{4}{W}{U}")));
     }
 
     private OjutaiMonument(final OjutaiMonument card) {
diff --git a/Mage.Sets/src/mage/cards/o/OketraTheTrue.java b/Mage.Sets/src/mage/cards/o/OketraTheTrue.java
index cbea6bc7233..6454e22dacf 100644
--- a/Mage.Sets/src/mage/cards/o/OketraTheTrue.java
+++ b/Mage.Sets/src/mage/cards/o/OketraTheTrue.java
@@ -44,7 +44,7 @@ public final class OketraTheTrue extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new OketraTheTrueRestrictionEffect()));
 
         // {3}{W}: Create a 1/1 white Warrior creature token with vigilance.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WarriorVigilantToken()), new ManaCostsImpl("{3}{W}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new WarriorVigilantToken()), new ManaCostsImpl<>("{3}{W}")));
     }
 
     private OketraTheTrue(final OketraTheTrue card) {
diff --git a/Mage.Sets/src/mage/cards/o/OketrasAttendant.java b/Mage.Sets/src/mage/cards/o/OketrasAttendant.java
index f2584a47cff..2b023ae93aa 100644
--- a/Mage.Sets/src/mage/cards/o/OketrasAttendant.java
+++ b/Mage.Sets/src/mage/cards/o/OketrasAttendant.java
@@ -30,10 +30,10 @@ public final class OketrasAttendant extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // Cycling {2}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
 
         // Embalm {3}{W}{W}
-        this.addAbility(new EmbalmAbility(new ManaCostsImpl("{3}{W}{W}"), this));
+        this.addAbility(new EmbalmAbility(new ManaCostsImpl<>("{3}{W}{W}"), this));
 
     }
 
diff --git a/Mage.Sets/src/mage/cards/o/OldFogey.java b/Mage.Sets/src/mage/cards/o/OldFogey.java
index f24a756ec5b..b41dd713550 100644
--- a/Mage.Sets/src/mage/cards/o/OldFogey.java
+++ b/Mage.Sets/src/mage/cards/o/OldFogey.java
@@ -36,7 +36,7 @@ public final class OldFogey extends CardImpl {
         // Phasing
         this.addAbility(PhasingAbility.getInstance());
         // Cumulative upkeep {1}
-        this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl("{1}")));
+        this.addAbility(new CumulativeUpkeepAbility(new ManaCostsImpl<>("{1}")));
         // Echo {G}{G}
         this.addAbility(new EchoAbility("{G}{G}"));
         // Fading 3
diff --git a/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java b/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java
index f4c45f556a4..3a4df847f96 100644
--- a/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java
+++ b/Mage.Sets/src/mage/cards/o/OliviasBloodsworn.java
@@ -45,7 +45,7 @@ public final class OliviasBloodsworn extends CardImpl {
         this.addAbility(new CantBlockAbility());
         
         // {R}: Target Vampire gains haste until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(HasteAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}"));
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OmenOfTheDead.java b/Mage.Sets/src/mage/cards/o/OmenOfTheDead.java
index 801a4d3d3ce..10cf5166419 100644
--- a/Mage.Sets/src/mage/cards/o/OmenOfTheDead.java
+++ b/Mage.Sets/src/mage/cards/o/OmenOfTheDead.java
@@ -33,7 +33,7 @@ public final class OmenOfTheDead extends CardImpl {
         this.addAbility(ability);
 
         // {2}{B}, Sacrifice Omen of the Dead: Scry 2.
-        ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl("{2}{B}"));
+        ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl<>("{2}{B}"));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OmenOfTheForge.java b/Mage.Sets/src/mage/cards/o/OmenOfTheForge.java
index 435b7875a77..504e0d55974 100644
--- a/Mage.Sets/src/mage/cards/o/OmenOfTheForge.java
+++ b/Mage.Sets/src/mage/cards/o/OmenOfTheForge.java
@@ -34,7 +34,7 @@ public final class OmenOfTheForge extends CardImpl {
         this.addAbility(ability);
 
         // {2}{R}, Sacrifice Omen of the Forge: Scry 2.
-        ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl("{2}{R}"));
+        ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl<>("{2}{R}"));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OmenOfTheHunt.java b/Mage.Sets/src/mage/cards/o/OmenOfTheHunt.java
index 4d415511e3a..cdf3651cacf 100644
--- a/Mage.Sets/src/mage/cards/o/OmenOfTheHunt.java
+++ b/Mage.Sets/src/mage/cards/o/OmenOfTheHunt.java
@@ -33,7 +33,7 @@ public final class OmenOfTheHunt extends CardImpl {
         ), true));
 
         // {2}{G}, Sacrifice Omen of the Hunt: Scry 2.
-        Ability ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl("{2}{G}"));
+        Ability ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl<>("{2}{G}"));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OmenOfTheSea.java b/Mage.Sets/src/mage/cards/o/OmenOfTheSea.java
index 6b9ddb1d343..1804e181f0a 100644
--- a/Mage.Sets/src/mage/cards/o/OmenOfTheSea.java
+++ b/Mage.Sets/src/mage/cards/o/OmenOfTheSea.java
@@ -31,7 +31,7 @@ public final class OmenOfTheSea extends CardImpl {
         this.addAbility(ability);
 
         // {2}{U}, Sacrifice Omen of the Sea: Scry 2.
-        ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl("{2}{U}"));
+        ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl<>("{2}{U}"));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OmenOfTheSun.java b/Mage.Sets/src/mage/cards/o/OmenOfTheSun.java
index ade5b947c57..ec8d814cc0d 100644
--- a/Mage.Sets/src/mage/cards/o/OmenOfTheSun.java
+++ b/Mage.Sets/src/mage/cards/o/OmenOfTheSun.java
@@ -35,7 +35,7 @@ public final class OmenOfTheSun extends CardImpl {
         this.addAbility(ability);
 
         // {2}{W}, Sacrifice Omen of the Sun: Scry 2.
-        ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl("{2}{W}"));
+        ability = new SimpleActivatedAbility(new ScryEffect(2), new ManaCostsImpl<>("{2}{W}"));
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OminousSeas.java b/Mage.Sets/src/mage/cards/o/OminousSeas.java
index 7cdab82f179..2edc64300a9 100644
--- a/Mage.Sets/src/mage/cards/o/OminousSeas.java
+++ b/Mage.Sets/src/mage/cards/o/OminousSeas.java
@@ -35,7 +35,7 @@ public final class OminousSeas extends CardImpl {
         ));
 
         // Cycling {2}
-        this.addAbility(new CyclingAbility(new ManaCostsImpl("{2}")));
+        this.addAbility(new CyclingAbility(new ManaCostsImpl<>("{2}")));
     }
 
     private OminousSeas(final OminousSeas card) {
diff --git a/Mage.Sets/src/mage/cards/o/OngoingInvestigation.java b/Mage.Sets/src/mage/cards/o/OngoingInvestigation.java
index d11567603b0..45dd0a30242 100644
--- a/Mage.Sets/src/mage/cards/o/OngoingInvestigation.java
+++ b/Mage.Sets/src/mage/cards/o/OngoingInvestigation.java
@@ -29,7 +29,7 @@ public final class OngoingInvestigation extends CardImpl {
         this.addAbility(new DealCombatDamageControlledTriggeredAbility(new InvestigateEffect()));
 
         // {1}{G}, Exile a creature card from your graveyard: Investigate. You gain 2 life.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new InvestigateEffect(), new ManaCostsImpl("{1}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new InvestigateEffect(), new ManaCostsImpl<>("{1}{G}"));
         ability.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(new FilterCreatureCard("a creature card from your graveyard"))));
         ability.addEffect(new GainLifeEffect(2));
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/OnyxMage.java b/Mage.Sets/src/mage/cards/o/OnyxMage.java
index 6f8bfaebac5..8d347153bab 100644
--- a/Mage.Sets/src/mage/cards/o/OnyxMage.java
+++ b/Mage.Sets/src/mage/cards/o/OnyxMage.java
@@ -29,7 +29,7 @@ public final class OnyxMage extends CardImpl {
 
         this.power = new MageInt(2);
         this.toughness = new MageInt(1);
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{1}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilityTargetEffect(DeathtouchAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{1}{B}"));
         ability.addTarget(new TargetControlledCreaturePermanent());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OnyxTalisman.java b/Mage.Sets/src/mage/cards/o/OnyxTalisman.java
index 77384d5ffc1..dea4ba3fd88 100644
--- a/Mage.Sets/src/mage/cards/o/OnyxTalisman.java
+++ b/Mage.Sets/src/mage/cards/o/OnyxTalisman.java
@@ -30,7 +30,7 @@ public final class OnyxTalisman extends CardImpl {
         super(ownerId, setInfo, new CardType[]{CardType.ARTIFACT}, "{2}");
 
         // Whenever a player casts a black spell, you may pay {3}. If you do, untap target permanent.
-        Ability ability = new SpellCastAllTriggeredAbility(new DoIfCostPaid(new UntapTargetEffect(), new ManaCostsImpl("{3}")), filter, false);
+        Ability ability = new SpellCastAllTriggeredAbility(new DoIfCostPaid(new UntapTargetEffect(), new ManaCostsImpl<>("{3}")), filter, false);
         ability.addTarget(new TargetPermanent());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java b/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java
index e4f2a10e621..22a8c2c41c3 100644
--- a/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java
+++ b/Mage.Sets/src/mage/cards/o/OonaQueenOfTheFae.java
@@ -35,7 +35,7 @@ public final class OonaQueenOfTheFae extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
 
         // {X}{UB}: Choose a color. Target opponent exiles the top X cards of their library. For each card of the chosen color exiled this way, create a 1/1 blue and black Faerie Rogue creature token with flying.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OonaQueenOfTheFaeEffect(), new ManaCostsImpl("{X}{U/B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OonaQueenOfTheFaeEffect(), new ManaCostsImpl<>("{X}{U/B}"));
         ability.addTarget(new TargetOpponent());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OozeFlux.java b/Mage.Sets/src/mage/cards/o/OozeFlux.java
index 86e08515b3a..a11b746c105 100644
--- a/Mage.Sets/src/mage/cards/o/OozeFlux.java
+++ b/Mage.Sets/src/mage/cards/o/OozeFlux.java
@@ -29,7 +29,7 @@ public final class OozeFlux extends CardImpl {
         super(ownerId,setInfo,new CardType[]{CardType.ENCHANTMENT},"{3}{G}");
 
         // {1}{G}, Remove one or more +1/+1 counters from among creatures you control: Create an X/X green Ooze creature token, where X is the number of +1/+1 counters removed this way.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OozeFluxCreateTokenEffect(new OozeToken()),new ManaCostsImpl("{1}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OozeFluxCreateTokenEffect(new OozeToken()),new ManaCostsImpl<>("{1}{G}"));
         ability.addCost(new RemoveVariableCountersTargetCost(StaticFilters.FILTER_CONTROLLED_CREATURES, CounterType.P1P1, "one or more", 1));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OozeGarden.java b/Mage.Sets/src/mage/cards/o/OozeGarden.java
index 6dc7166349a..c5b49306d07 100644
--- a/Mage.Sets/src/mage/cards/o/OozeGarden.java
+++ b/Mage.Sets/src/mage/cards/o/OozeGarden.java
@@ -39,7 +39,7 @@ public final class OozeGarden extends CardImpl {
 
 
         // {1}{G}, Sacrifice a non-Ooze creature: Create an X/X green Ooze creature token, where X is the sacrificed creature's power. Activate this ability only any time you could cast a sorcery.
-        Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new OozeGardenCreateTokenEffect(), new ManaCostsImpl("{1}{G}"));
+        Ability ability = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD, new OozeGardenCreateTokenEffect(), new ManaCostsImpl<>("{1}{G}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(1, 1, filter, true)));
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OpalAcrolith.java b/Mage.Sets/src/mage/cards/o/OpalAcrolith.java
index 2844e57114a..9aaf7582a15 100644
--- a/Mage.Sets/src/mage/cards/o/OpalAcrolith.java
+++ b/Mage.Sets/src/mage/cards/o/OpalAcrolith.java
@@ -42,7 +42,7 @@ public final class OpalAcrolith extends CardImpl {
                 "Whenever an opponent casts a creature spell, if Opal Acrolith is an enchantment, Opal Acrolith becomes a 2/4 Soldier creature."));
 
         // {0}: Opal Acrolith becomes an enchantment.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesEnchantmentSourceEffect(), new ManaCostsImpl("{0}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesEnchantmentSourceEffect(), new ManaCostsImpl<>("{0}")));
 
     }
 
diff --git a/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java b/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java
index 82f581e8fcb..c7798343598 100644
--- a/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java
+++ b/Mage.Sets/src/mage/cards/o/OpalEyeKondasYojimbo.java
@@ -46,7 +46,7 @@ public final class OpalEyeKondasYojimbo extends CardImpl {
         this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new OpalEyeKondasYojimboRedirectionEffect(), new TapSourceCost()));
 
         // {1}{W}: Prevent the next 1 damage that would be dealt to Opal-Eye this turn.        
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{1}{W}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{1}{W}")));
 
     }
 
diff --git a/Mage.Sets/src/mage/cards/o/OracleOfNectars.java b/Mage.Sets/src/mage/cards/o/OracleOfNectars.java
index 02a5ef8b617..d3cdb1535e2 100644
--- a/Mage.Sets/src/mage/cards/o/OracleOfNectars.java
+++ b/Mage.Sets/src/mage/cards/o/OracleOfNectars.java
@@ -30,7 +30,7 @@ public final class OracleOfNectars extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {X}, {tap}: You gain X life.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(ManacostVariableValue.REGULAR), new ManaCostsImpl("{X}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeEffect(ManacostVariableValue.REGULAR), new ManaCostsImpl<>("{X}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
     }
diff --git a/Mage.Sets/src/mage/cards/o/OrcishHealer.java b/Mage.Sets/src/mage/cards/o/OrcishHealer.java
index e2def7b2676..4baf9349f3e 100644
--- a/Mage.Sets/src/mage/cards/o/OrcishHealer.java
+++ b/Mage.Sets/src/mage/cards/o/OrcishHealer.java
@@ -43,19 +43,19 @@ public final class OrcishHealer extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {R}{R}, {tap}: Target creature can't be regenerated this turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl("{R}{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CantBeRegeneratedTargetEffect(Duration.EndOfTurn), new ManaCostsImpl<>("{R}{R}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
 
         // {B}{B}{R}, {tap}: Regenerate target black or green creature.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{B}{B}{R}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{B}{B}{R}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
 
         // {R}{G}{G}, {tap}: Regenerate target black or green creature.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl("{R}{G}{G}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new RegenerateTargetEffect(), new ManaCostsImpl<>("{R}{G}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addTarget(new TargetCreaturePermanent(filter));
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/OrcishSettlers.java b/Mage.Sets/src/mage/cards/o/OrcishSettlers.java
index 4bbdbeaacbd..99f02275963 100644
--- a/Mage.Sets/src/mage/cards/o/OrcishSettlers.java
+++ b/Mage.Sets/src/mage/cards/o/OrcishSettlers.java
@@ -36,7 +36,7 @@ public final class OrcishSettlers extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {X}{X}{R}, {tap}, Sacrifice Orcish Settlers: Destroy X target lands.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OrcishSettlersEffect(), new ManaCostsImpl("{X}{X}{R}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OrcishSettlersEffect(), new ManaCostsImpl<>("{X}{X}{R}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/OrcishVeteran.java b/Mage.Sets/src/mage/cards/o/OrcishVeteran.java
index 7cb262b02fd..b741b6f0a27 100644
--- a/Mage.Sets/src/mage/cards/o/OrcishVeteran.java
+++ b/Mage.Sets/src/mage/cards/o/OrcishVeteran.java
@@ -44,7 +44,7 @@ public final class OrcishVeteran extends CardImpl {
         this.addAbility(new SimpleStaticAbility(Zone.BATTLEFIELD, new CantBlockCreaturesSourceEffect(filter)));
         
         // {R}: Orcish Veteran gains first strike until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{R}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{R}")));
     }
 
     private OrcishVeteran(final OrcishVeteran card) {
diff --git a/Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java b/Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java
index 72b77f1c1e6..bacd30fd543 100644
--- a/Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java
+++ b/Mage.Sets/src/mage/cards/o/OrderOfLeitbur.java
@@ -35,10 +35,10 @@ public final class OrderOfLeitbur extends CardImpl {
         this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
 
         // {W}: Order of Leitbur gains first strike until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")));
 
         // {W}{W}: Order of Leitbur gets +1/+0 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{W}{W}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}")));
     }
 
     private OrderOfLeitbur(final OrderOfLeitbur card) {
diff --git a/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java b/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java
index b6f6487cc62..c86d891b3e3 100644
--- a/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java
+++ b/Mage.Sets/src/mage/cards/o/OrderOfTheEbonHand.java
@@ -34,10 +34,10 @@ public final class OrderOfTheEbonHand extends CardImpl {
         this.addAbility(ProtectionAbility.from(ObjectColor.WHITE));
 
         // {B}: Order of the Ebon Hand gains first strike until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{B}")));
 
         // {B}{B}: Order of the Ebon Hand gets +1/+0 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{B}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{B}{B}")));
     }
 
     private OrderOfTheEbonHand(final OrderOfTheEbonHand card) {
diff --git a/Mage.Sets/src/mage/cards/o/OrderOfTheGoldenCricket.java b/Mage.Sets/src/mage/cards/o/OrderOfTheGoldenCricket.java
index 019634a4b67..13ec0e99619 100644
--- a/Mage.Sets/src/mage/cards/o/OrderOfTheGoldenCricket.java
+++ b/Mage.Sets/src/mage/cards/o/OrderOfTheGoldenCricket.java
@@ -30,7 +30,7 @@ public final class OrderOfTheGoldenCricket extends CardImpl {
 
         // Whenever Order of the Golden Cricket attacks, you may pay {W}. If you do, it gains flying until end of turn.
         Ability ability = new AttacksTriggeredAbility(new DoIfCostPaid(
-                new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}")),
+                new GainAbilitySourceEffect(FlyingAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")),
                 false,
                 "Whenever {this} attacks, you may pay {W}. If you do, it gains flying until end of turn.");
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/OrderOfTheWhiteShield.java b/Mage.Sets/src/mage/cards/o/OrderOfTheWhiteShield.java
index b598253512b..180c9c81074 100644
--- a/Mage.Sets/src/mage/cards/o/OrderOfTheWhiteShield.java
+++ b/Mage.Sets/src/mage/cards/o/OrderOfTheWhiteShield.java
@@ -34,10 +34,10 @@ public final class OrderOfTheWhiteShield extends CardImpl {
         this.addAbility(ProtectionAbility.from(ObjectColor.BLACK));
 
         // {W}: Order of the White Shield gains first strike until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl("{W}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainAbilitySourceEffect(FirstStrikeAbility.getInstance(), Duration.EndOfTurn), new ManaCostsImpl<>("{W}")));
 
         // {W}{W}: Order of the White Shield gets +1/+0 until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl("{W}{W}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BoostSourceEffect(1,0, Duration.EndOfTurn), new ManaCostsImpl<>("{W}{W}")));
     }
 
     private OrderOfTheWhiteShield(final OrderOfTheWhiteShield card) {
diff --git a/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java b/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java
index 7331784c158..260732aca82 100644
--- a/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java
+++ b/Mage.Sets/src/mage/cards/o/OrderOfWhiteclay.java
@@ -41,7 +41,7 @@ public final class OrderOfWhiteclay extends CardImpl {
         this.toughness = new MageInt(4);
 
         // {1}{W}{W}, {untap}: Return target creature card with converted mana cost 3 or less from your graveyard to the battlefield.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl("{1}{W}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new ReturnFromGraveyardToBattlefieldTargetEffect(), new ManaCostsImpl<>("{1}{W}{W}"));
         ability.addCost(new UntapSourceCost());
         Target target = new TargetCardInYourGraveyard(filter);
         ability.addTarget(target);
diff --git a/Mage.Sets/src/mage/cards/o/OrdruunCommando.java b/Mage.Sets/src/mage/cards/o/OrdruunCommando.java
index 1588f57bab6..dfae5051ef3 100644
--- a/Mage.Sets/src/mage/cards/o/OrdruunCommando.java
+++ b/Mage.Sets/src/mage/cards/o/OrdruunCommando.java
@@ -27,7 +27,7 @@ public final class OrdruunCommando extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {W}: Prevent the next 1 damage that would be dealt to Ordruun Commando this turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl("{W}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new PreventDamageToSourceEffect(Duration.EndOfTurn, 1), new ManaCostsImpl<>("{W}")));
     }
 
     private OrdruunCommando(final OrdruunCommando card) {
diff --git a/Mage.Sets/src/mage/cards/o/OreadOfMountainsBlaze.java b/Mage.Sets/src/mage/cards/o/OreadOfMountainsBlaze.java
index 8f2f8c49e0c..cff2af1938a 100644
--- a/Mage.Sets/src/mage/cards/o/OreadOfMountainsBlaze.java
+++ b/Mage.Sets/src/mage/cards/o/OreadOfMountainsBlaze.java
@@ -27,7 +27,7 @@ public final class OreadOfMountainsBlaze extends CardImpl {
 
         // {2}{R}, Discard a card: Draw a card.
         Ability ability = new SimpleActivatedAbility(
-                new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{2}{R}")
+                new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{2}{R}")
         );
         ability.addCost(new DiscardCardCost());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java b/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java
index eec623e9874..3e35c5f2a34 100644
--- a/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java
+++ b/Mage.Sets/src/mage/cards/o/OriginSpellbomb.java
@@ -31,7 +31,7 @@ public final class OriginSpellbomb extends CardImpl {
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
-        this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{W}")), false));
+        this.addAbility(new DiesSourceTriggeredAbility(new DoIfCostPaid(new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}")), false));
     }
 
     public OriginSpellbomb (final OriginSpellbomb card) {
diff --git a/Mage.Sets/src/mage/cards/o/OrmosArchiveKeeper.java b/Mage.Sets/src/mage/cards/o/OrmosArchiveKeeper.java
index c7be77ddf48..a699befc570 100644
--- a/Mage.Sets/src/mage/cards/o/OrmosArchiveKeeper.java
+++ b/Mage.Sets/src/mage/cards/o/OrmosArchiveKeeper.java
@@ -48,7 +48,7 @@ public final class OrmosArchiveKeeper extends CardImpl {
 
         // {1}{U}{U}, Discard three cards with different names: Draw five cards.
         Ability ability = new SimpleActivatedAbility(
-                new DrawCardSourceControllerEffect(5), new ManaCostsImpl("{1}{U}{U}")
+                new DrawCardSourceControllerEffect(5), new ManaCostsImpl<>("{1}{U}{U}")
         );
         ability.addCost(new DiscardTargetCost(new OrmosArchiveKeeperTarget()));
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java
index c4e673990c5..693d3620a8c 100644
--- a/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java
+++ b/Mage.Sets/src/mage/cards/o/OrochiEggwatcher.java
@@ -73,7 +73,7 @@ public final class OrochiEggwatcher extends CardImpl {
 
         // {2}{G}, {T}: Create a 1/1 green Snake creature token. If you control ten or more creatures, flip Orochi Eggwatcher.
         Ability ability;
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SnakeToken()), new ManaCostsImpl("{2}{G}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new SnakeToken()), new ManaCostsImpl<>("{2}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addEffect(new ConditionalOneShotEffect(new FlipSourceEffect(new ShidakoBroodmistress()),
                 new PermanentsOnTheBattlefieldCondition(new FilterControlledCreaturePermanent(), ComparisonType.MORE_THAN, 9), "If you control ten or more creatures, flip {this}"));
@@ -106,7 +106,7 @@ class ShidakoBroodmistress extends TokenImpl {
         ability = new SimpleActivatedAbility(
                 Zone.BATTLEFIELD,
                 new BoostTargetEffect(3, 3, Duration.EndOfTurn),
-                new ManaCostsImpl("{G}"));
+                new ManaCostsImpl<>("{G}"));
         ability.addCost(new SacrificeTargetCost(new TargetControlledCreaturePermanent(FILTER_CONTROLLED_CREATURE_SHORT_TEXT)));
         ability.addTarget(new TargetCreaturePermanent());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/OrosTheAvenger.java b/Mage.Sets/src/mage/cards/o/OrosTheAvenger.java
index 0ce3d04b37c..65af659f813 100644
--- a/Mage.Sets/src/mage/cards/o/OrosTheAvenger.java
+++ b/Mage.Sets/src/mage/cards/o/OrosTheAvenger.java
@@ -42,7 +42,7 @@ public final class OrosTheAvenger extends CardImpl {
         this.addAbility(FlyingAbility.getInstance());
         // Whenever Oros, the Avenger deals combat damage to a player, you may pay {2}{W}. If you do, Oros deals 3 damage to each nonwhite creature.
         this.addAbility(new DealsCombatDamageToAPlayerTriggeredAbility(
-                new DoIfCostPaid(new DamageAllEffect(3, filter), new ManaCostsImpl("{2}{W}")), false));
+                new DoIfCostPaid(new DamageAllEffect(3, filter), new ManaCostsImpl<>("{2}{W}")), false));
     }
 
     private OrosTheAvenger(final OrosTheAvenger card) {
diff --git a/Mage.Sets/src/mage/cards/o/OrzhovCluestone.java b/Mage.Sets/src/mage/cards/o/OrzhovCluestone.java
index 02f26774361..765c2ee4b42 100644
--- a/Mage.Sets/src/mage/cards/o/OrzhovCluestone.java
+++ b/Mage.Sets/src/mage/cards/o/OrzhovCluestone.java
@@ -32,7 +32,7 @@ public final class OrzhovCluestone extends CardImpl {
         this.addAbility(new BlackManaAbility());
 
         // {W}{B}, {T}, Sacrifice Orzhov Cluestone: Draw a card.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl("{W}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new DrawCardSourceControllerEffect(1), new ManaCostsImpl<>("{W}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new SacrificeSourceCost());
         this.addAbility(ability);
diff --git a/Mage.Sets/src/mage/cards/o/OrzhovGuildmage.java b/Mage.Sets/src/mage/cards/o/OrzhovGuildmage.java
index bf840cfb654..e3a1f299c00 100644
--- a/Mage.Sets/src/mage/cards/o/OrzhovGuildmage.java
+++ b/Mage.Sets/src/mage/cards/o/OrzhovGuildmage.java
@@ -29,12 +29,12 @@ public final class OrzhovGuildmage extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {2}{W}: Target player gains 1 life.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeTargetEffect(1), new ManaCostsImpl("{2}{W}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new GainLifeTargetEffect(1), new ManaCostsImpl<>("{2}{W}"));
         ability.addTarget(new TargetPlayer(1));
         this.addAbility(ability);
 
         // {2}{B}: Each player loses 1 life.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeAllPlayersEffect(1), new ManaCostsImpl("{2}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeAllPlayersEffect(1), new ManaCostsImpl<>("{2}{B}")));
     }
 
     private OrzhovGuildmage(final OrzhovGuildmage card) {
diff --git a/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java b/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java
index debfc95babe..71c409417ba 100644
--- a/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java
+++ b/Mage.Sets/src/mage/cards/o/OrzhovKeyrune.java
@@ -30,7 +30,7 @@ public final class OrzhovKeyrune extends CardImpl {
         this.addAbility(new BlackManaAbility());
 
         // {W}{B}: Orzhov Keyrune becomes a 1/4 white and black Thrull artifact creature with lifelink until end of turn.
-        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new OrzhovKeyruneToken(), "", Duration.EndOfTurn), new ManaCostsImpl("{W}{B}")));
+        this.addAbility(new SimpleActivatedAbility(Zone.BATTLEFIELD, new BecomesCreatureSourceEffect(new OrzhovKeyruneToken(), "", Duration.EndOfTurn), new ManaCostsImpl<>("{W}{B}")));
     }
 
     private OrzhovKeyrune(final OrzhovKeyrune card) {
diff --git a/Mage.Sets/src/mage/cards/o/OrzhovaTheChurchOfDeals.java b/Mage.Sets/src/mage/cards/o/OrzhovaTheChurchOfDeals.java
index 996106a2761..94bef515c84 100644
--- a/Mage.Sets/src/mage/cards/o/OrzhovaTheChurchOfDeals.java
+++ b/Mage.Sets/src/mage/cards/o/OrzhovaTheChurchOfDeals.java
@@ -24,7 +24,7 @@ public final class OrzhovaTheChurchOfDeals extends CardImpl {
     public OrzhovaTheChurchOfDeals(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.LAND},"");
         this.addAbility(new ColorlessManaAbility());
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl("{3}{W}{B}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new LoseLifeTargetEffect(1), new ManaCostsImpl<>("{3}{W}{B}"));
         ability.addCost(new TapSourceCost());
         ability.addEffect(new GainLifeEffect(1));
         ability.addTarget(new TargetPlayer(1));
diff --git a/Mage.Sets/src/mage/cards/o/OsgirTheReconstructor.java b/Mage.Sets/src/mage/cards/o/OsgirTheReconstructor.java
index 22b430937ea..2fe8fbc06d3 100644
--- a/Mage.Sets/src/mage/cards/o/OsgirTheReconstructor.java
+++ b/Mage.Sets/src/mage/cards/o/OsgirTheReconstructor.java
@@ -65,7 +65,7 @@ public final class OsgirTheReconstructor extends CardImpl {
         // {X},{T}, Exile an artifact with mana value X from your graveyard: Create two tokens that are copies of the exiled card. Activate only as
         Ability copyAbility = new ActivateAsSorceryActivatedAbility(Zone.BATTLEFIELD,
                 new OsgirTheReconstructorCreateArtifactTokensEffect(),
-                new ManaCostsImpl("{X}"));
+                new ManaCostsImpl<>("{X}"));
         copyAbility.addCost(new TapSourceCost());
         copyAbility.addCost(new ExileFromGraveCost(new TargetCardInYourGraveyard(), "Exile an artifact card with mana value X from your graveyard"));
 
diff --git a/Mage.Sets/src/mage/cards/o/Overtaker.java b/Mage.Sets/src/mage/cards/o/Overtaker.java
index 499850841bf..0a470a8140e 100644
--- a/Mage.Sets/src/mage/cards/o/Overtaker.java
+++ b/Mage.Sets/src/mage/cards/o/Overtaker.java
@@ -35,7 +35,7 @@ public final class Overtaker extends CardImpl {
         this.toughness = new MageInt(1);
 
         // {3}{U}, {tap}, Discard a card: Untap target creature and gain control of it until end of turn. That creature gains haste until end of turn.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl("{3}{U}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new UntapTargetEffect(), new ManaCostsImpl<>("{3}{U}"));
         ability.addCost(new TapSourceCost());
         ability.addCost(new DiscardCardCost());
         Effect effect = new GainControlTargetEffect(Duration.EndOfTurn);
diff --git a/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java b/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java
index 7218b945465..b6d83e50bfc 100644
--- a/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java
+++ b/Mage.Sets/src/mage/cards/o/OviyaPashiriSageLifecrafter.java
@@ -33,11 +33,11 @@ public final class OviyaPashiriSageLifecrafter extends CardImpl {
         this.toughness = new MageInt(2);
 
         // {2}{G}, {T}: Create a 1/1 colorless Servo artifact creature token.
-        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ServoToken(), 1), new ManaCostsImpl("{2}{G}"));
+        Ability ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new CreateTokenEffect(new ServoToken(), 1), new ManaCostsImpl<>("{2}{G}"));
         ability.addCost(new TapSourceCost());
         this.addAbility(ability);
         // {4}{G}, {T}: Create an X/X colorless Construct artifact creature token, where X is the number of creatures you control.
-        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OviyaPashiriSageLifecrafterEffect(), new ManaCostsImpl("{4}{G}"));
+        ability = new SimpleActivatedAbility(Zone.BATTLEFIELD, new OviyaPashiriSageLifecrafterEffect(), new ManaCostsImpl<>("{4}{G}"));
         ability.addCost(new TapSourceCost());
         ability.addHint(CreaturesYouControlHint.instance);
         this.addAbility(ability);