diff --git a/Mage.Client/pom.xml b/Mage.Client/pom.xml
index 3a2612a36a..a3264c3aab 100644
--- a/Mage.Client/pom.xml
+++ b/Mage.Client/pom.xml
@@ -56,7 +56,6 @@
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
-            <version>20.0</version>
         </dependency>
         <dependency>
             <groupId>org.swinglabs</groupId>
diff --git a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java
index 94327e81cd..0e3ca45c17 100644
--- a/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java
+++ b/Mage.Client/src/main/java/org/mage/plugins/card/dl/sources/ScryfallImageSupportCards.java
@@ -1,5 +1,6 @@
 package org.mage.plugins.card.dl.sources;
 
+import com.google.common.collect.ImmutableMap;
 import org.tritonus.share.ArraySet;
 
 import java.util.HashMap;
@@ -12,22 +13,19 @@ import java.util.Set;
  */
 public class ScryfallImageSupportCards {
 
-    private static final Map<String, String> xmageSetsToScryfall = new HashMap<String, String>() {
-        {
-            // xmage -> scryfall
-            put("DD3GVL", "gvl");
-            put("DD3JVC", "jvc");
-            put("DD3DVD", "dvd");
-            put("DD3EVG", "evg");
-            put("MPS-AKH", "mp2");
-            put("MBP", "pmei");
-            put("WMCQ", "pwcq");
-            put("EURO", "pelp");
-            put("GPX", "pgpx");
-            put("MED", "me1");
-            put("MEDM", "med");
-        }
-    };
+    private static final Map<String, String> xmageSetsToScryfall = ImmutableMap.<String, String>builder().put("DD3GVL", "gvl").
+            put("DD3JVC", "jvc").
+            put("DD3DVD", "dvd").
+            put("DD3EVG", "evg").
+            put("MPS-AKH", "mp2").
+            put("MBP", "pmei").
+            put("WMCQ", "pwcq").
+            put("EURO", "pelp").
+            put("GPX", "pgpx").
+            put("MED", "me1").
+            put("MEDM", "med").build();
+
+
 
     private static final Set<String> supportedSets = new ArraySet<String>() {
         {
diff --git a/Mage.Sets/src/mage/cards/s/ScreechingSilcaw.java b/Mage.Sets/src/mage/cards/s/ScreechingSilcaw.java
index b356cdac11..da04611f60 100644
--- a/Mage.Sets/src/mage/cards/s/ScreechingSilcaw.java
+++ b/Mage.Sets/src/mage/cards/s/ScreechingSilcaw.java
@@ -20,7 +20,7 @@ import mage.constants.SubType;
  */
 public final class ScreechingSilcaw extends CardImpl {
 
-    private static final String text = "<i>Metalcraft</i> &mdash; Whenever Screeching Silcaw deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of their library into their graveyard.";
+    private static final String rule = "<i>Metalcraft</i> &mdash; Whenever Screeching Silcaw deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of their library into their graveyard.";
 
     public ScreechingSilcaw(UUID ownerId, CardSetInfo setInfo) {
         super(ownerId,setInfo,new CardType[]{CardType.CREATURE},"{1}{U}");
@@ -34,7 +34,7 @@ public final class ScreechingSilcaw extends CardImpl {
         //"<i>Metalcraft</i> &mdash; Whenever Screeching Silcaw deals combat damage to a player, if you control three or more artifacts, that player puts the top four cards of their library into their graveyard.
         TriggeredAbility conditional = new ConditionalInterveningIfTriggeredAbility(
                 new DealsCombatDamageToAPlayerTriggeredAbility(new PutLibraryIntoGraveTargetEffect(4), false, true),
-                MetalcraftCondition.instance, text);
+                MetalcraftCondition.instance, rule);
         this.addAbility(conditional);
     }
 
diff --git a/Mage/pom.xml b/Mage/pom.xml
index 80815f55ac..3e5927dd24 100644
--- a/Mage/pom.xml
+++ b/Mage/pom.xml
@@ -26,6 +26,10 @@
             <version>1.4.197</version>
             <scope>runtime</scope>
         </dependency>
+        <dependency>
+            <groupId>com.google.guava</groupId>
+            <artifactId>guava</artifactId>
+        </dependency>
         <dependency>
             <groupId>com.j256.ormlite</groupId>
             <artifactId>ormlite-jdbc</artifactId>
diff --git a/Mage/src/main/java/mage/cards/CardImpl.java b/Mage/src/main/java/mage/cards/CardImpl.java
index e6e1db75cb..ae22f9da2a 100644
--- a/Mage/src/main/java/mage/cards/CardImpl.java
+++ b/Mage/src/main/java/mage/cards/CardImpl.java
@@ -1,5 +1,6 @@
 package mage.cards;
 
+import com.google.common.collect.ImmutableList;
 import mage.MageObject;
 import mage.MageObjectImpl;
 import mage.Mana;
@@ -224,11 +225,7 @@ public abstract class CardImpl extends MageObjectImpl implements Card {
         game.getState().getCardState(objectId).addInfo(key, value);
     }
 
-    protected static final ArrayList<String> rulesError = new ArrayList<String>() {
-        {
-            add("Exception occurred in rules generation");
-        }
-    };
+    protected static final List<String> rulesError = ImmutableList.of("Exception occurred in rules generation");
 
     @Override
     public List<String> getRules() {
diff --git a/Mage/src/main/java/mage/players/PlayerImpl.java b/Mage/src/main/java/mage/players/PlayerImpl.java
index 9e248bf627..27191a9765 100644
--- a/Mage/src/main/java/mage/players/PlayerImpl.java
+++ b/Mage/src/main/java/mage/players/PlayerImpl.java
@@ -1,5 +1,6 @@
 package mage.players;
 
+import com.google.common.collect.ImmutableMap;
 import mage.ConditionalMana;
 import mage.MageObject;
 import mage.MageObjectReference;
@@ -178,11 +179,10 @@ public abstract class PlayerImpl implements Player, Serializable {
     /**
      * During some steps we can't play anything
      */
-    protected final Map<PhaseStep, Step.StepPart> silentPhaseSteps = new EnumMap<PhaseStep, Step.StepPart>(PhaseStep.class) {
-        {
-            put(PhaseStep.DECLARE_ATTACKERS, Step.StepPart.PRE);
-        }
-    };
+    protected final Map<PhaseStep, Step.StepPart> silentPhaseSteps = ImmutableMap.<PhaseStep, Step.StepPart>builder().
+            put(PhaseStep.DECLARE_ATTACKERS, Step.StepPart.PRE).build();
+
+
 
     public PlayerImpl(String name, RangeOfInfluence range) {
         this(UUID.randomUUID());
diff --git a/pom.xml b/pom.xml
index f197d1c22f..bf103b4177 100644
--- a/pom.xml
+++ b/pom.xml
@@ -109,6 +109,11 @@
                 <artifactId>slf4j-log4j12</artifactId>
                 <version>1.8.0-beta2</version>
             </dependency>
+            <dependency>
+                <groupId>com.google.guava</groupId>
+                <artifactId>guava</artifactId>
+                <version>20.0</version>
+            </dependency>
         </dependencies>
     </dependencyManagement>
 </project>