diff --git a/src/main/java/org/bukkit/entity/Endermite.java b/src/main/java/org/bukkit/entity/Endermite.java
new file mode 100644
index 0000000000..cda20d56cc
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/Endermite.java
@@ -0,0 +1,13 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Endermite.
+ */
+public interface Endermite extends Monster {
+
+    /**
+     * Represents the lifetime in ticks of the Endermite. Should disappear after 2400 ticks.
+     * @return the lifetime of the Endermite in ticks.
+     */
+    public int getLifetime();
+}
diff --git a/src/main/java/org/bukkit/entity/EntityType.java b/src/main/java/org/bukkit/entity/EntityType.java
index 39ecb130a8..23dcc69e6f 100644
--- a/src/main/java/org/bukkit/entity/EntityType.java
+++ b/src/main/java/org/bukkit/entity/EntityType.java
@@ -130,6 +130,8 @@ public enum EntityType {
     WITHER("WitherBoss", Wither.class, 64),
     BAT("Bat", Bat.class, 65),
     WITCH("Witch", Witch.class, 66),
+    ENDERMITE("Endermite", Endermite.class, 67),
+    GUARDIAN("Guardian", Guardian.class, 68),
     PIG("Pig", Pig.class, 90),
     SHEEP("Sheep", Sheep.class, 91),
     COW("Cow", Cow.class, 92),
@@ -141,6 +143,7 @@ public enum EntityType {
     OCELOT("Ozelot", Ocelot.class, 98),
     IRON_GOLEM("VillagerGolem", IronGolem.class, 99),
     HORSE("EntityHorse", Horse.class, 100),
+    RABBIT("Rabbit", Rabbit.class, 101),
     VILLAGER("Villager", Villager.class, 120),
     ENDER_CRYSTAL("EnderCrystal", EnderCrystal.class, 200),
     // These don't have an entity ID in nms.EntityTypes.
diff --git a/src/main/java/org/bukkit/entity/Guardian.java b/src/main/java/org/bukkit/entity/Guardian.java
new file mode 100644
index 0000000000..24f4125c75
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/Guardian.java
@@ -0,0 +1,21 @@
+package org.bukkit.entity;
+
+/**
+ * Represents a Guardian.
+ */
+public interface Guardian extends Monster, WaterMob {
+
+    /**
+     *
+     *
+     * @return true if this guardian is an Elder
+     */
+    public boolean isElder();
+
+    /**
+     * Sets the guardian to be an elder or not.
+     *
+     */
+    public void setElder(boolean isElder);
+
+}
diff --git a/src/main/java/org/bukkit/entity/Rabbit.java b/src/main/java/org/bukkit/entity/Rabbit.java
new file mode 100644
index 0000000000..bd509c88e4
--- /dev/null
+++ b/src/main/java/org/bukkit/entity/Rabbit.java
@@ -0,0 +1,39 @@
+package org.bukkit.entity;
+
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * Represents a Rabbit.
+ */
+public interface Rabbit extends Animals
+{
+
+    /**
+     * Gets the type of rabbit.
+     *
+     * @return The type of rabbit
+     */
+    public RabbitType getRabbitType();
+
+    /**
+     * Sets the type of rabbit.
+     *
+     * @param type The type of rabbit
+     */
+    public void setRabbitType(RabbitType type);
+
+    /*
+    * Represents the various different Rabbit types.
+    */
+    public enum RabbitType
+    {
+        BROWN,
+        WHITE,
+        BLACK,
+        BLACK_AND_WHITE,
+        GOLD,
+        SALT_PEPPER,
+        KILLER
+    }
+}