diff --git a/src/Entity.php b/src/Entity.php
index eef5de20b..d2dfef3a3 100644
--- a/src/Entity.php
+++ b/src/Entity.php
@@ -230,14 +230,15 @@ abstract class Entity extends Position{
 require_once("entity/DamageableEntity.php");
 require_once("entity/ProjectileSourceEntity.php");
 require_once("entity/RideableEntity.php");
+require_once("entity/TameableEntity.php");
 require_once("entity/AttachableEntity.php");
+require_once("entity/AgeableEntity.php");
 require_once("entity/ExplosiveEntity.php");
 require_once("entity/ColorableEntity.php");
 
 require_once("entity/LivingEntity.php");
 require_once("entity/CreatureEntity.php");
 require_once("entity/MonsterEntity.php");
-require_once("entity/AgeableEntity.php");
 require_once("entity/AnimalEntity.php");
 require_once("entity/HumanEntity.php");
 require_once("entity/ProjectileEntity.php");
diff --git a/src/entity/AgeableEntity.php b/src/entity/AgeableEntity.php
index 2799e84ec..3ac7a8520 100644
--- a/src/entity/AgeableEntity.php
+++ b/src/entity/AgeableEntity.php
@@ -19,6 +19,6 @@
  *
 */
 
-abstract class AgeableEntity extends CreatureEntity{
+interface AgeableEntity{
 
 }
\ No newline at end of file
diff --git a/src/entity/AnimalEntity.php b/src/entity/AnimalEntity.php
index e833f4251..4a45d0d82 100644
--- a/src/entity/AnimalEntity.php
+++ b/src/entity/AnimalEntity.php
@@ -19,6 +19,6 @@
  *
 */
 
-abstract class AnimalEntity extends AgeableEntity{
+abstract class AnimalEntity extends CreatureEntity implements AgeableEntity{
 
 }
\ No newline at end of file
diff --git a/src/entity/EnderPearlEntity.php b/src/entity/EnderPearlEntity.php
new file mode 100644
index 000000000..43bdbad3f
--- /dev/null
+++ b/src/entity/EnderPearlEntity.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class EnderPearlEntity extends ProjectileEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/EndermanEntity.php b/src/entity/EndermanEntity.php
new file mode 100644
index 000000000..264bc21a9
--- /dev/null
+++ b/src/entity/EndermanEntity.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class EndermanEntity extends MonsterEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/OcelotEntity.php b/src/entity/OcelotEntity.php
new file mode 100644
index 000000000..c9ae0e043
--- /dev/null
+++ b/src/entity/OcelotEntity.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class OcelotEntity extends AnimalEntity implements TameableEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/SilverfishEntity.php b/src/entity/SilverfishEntity.php
new file mode 100644
index 000000000..e0f520e18
--- /dev/null
+++ b/src/entity/SilverfishEntity.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class SilverfishEntity extends MonsterEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/SlimeEntity.php b/src/entity/SlimeEntity.php
new file mode 100644
index 000000000..9f579d189
--- /dev/null
+++ b/src/entity/SlimeEntity.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class SlimeEntity extends LivingEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/TameableEntity.php b/src/entity/TameableEntity.php
new file mode 100644
index 000000000..05550dde3
--- /dev/null
+++ b/src/entity/TameableEntity.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+interface TameableEntity{
+
+}
\ No newline at end of file
diff --git a/src/entity/WolfEntity.php b/src/entity/WolfEntity.php
new file mode 100644
index 000000000..80b6e3659
--- /dev/null
+++ b/src/entity/WolfEntity.php
@@ -0,0 +1,24 @@
+<?php
+
+/**
+ *
+ *  ____            _        _   __  __ _                  __  __ ____  
+ * |  _ \ ___   ___| | _____| |_|  \/  (_)_ __   ___      |  \/  |  _ \ 
+ * | |_) / _ \ / __| |/ / _ \ __| |\/| | | '_ \ / _ \_____| |\/| | |_) |
+ * |  __/ (_) | (__|   <  __/ |_| |  | | | | | |  __/_____| |  | |  __/ 
+ * |_|   \___/ \___|_|\_\___|\__|_|  |_|_|_| |_|\___|     |_|  |_|_| 
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Lesser General Public License as published by
+ * the Free Software Foundation, either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * @author PocketMine Team
+ * @link http://www.pocketmine.net/
+ * 
+ *
+*/
+
+class WolfEntity extends AnimalEntity implements TameableEntity{
+
+}
\ No newline at end of file