diff --git a/src/test/java/demo/commands/SummonCommand.java b/src/test/java/demo/commands/SummonCommand.java
index 0e03ef215..e47a49c0f 100644
--- a/src/test/java/demo/commands/SummonCommand.java
+++ b/src/test/java/demo/commands/SummonCommand.java
@@ -3,17 +3,22 @@ package demo.commands;
 import net.minestom.server.command.CommandSender;
 import net.minestom.server.command.builder.Command;
 import net.minestom.server.command.builder.CommandContext;
+import net.minestom.server.command.builder.arguments.ArgumentEnum;
 import net.minestom.server.command.builder.arguments.ArgumentType;
 import net.minestom.server.command.builder.arguments.minecraft.registry.ArgumentEntityType;
 import net.minestom.server.command.builder.arguments.relative.ArgumentRelativeVec3;
 import net.minestom.server.command.builder.condition.Conditions;
 import net.minestom.server.entity.Entity;
+import net.minestom.server.entity.EntityCreature;
+import net.minestom.server.entity.EntityType;
+import net.minestom.server.entity.LivingEntity;
 import org.jetbrains.annotations.NotNull;
 
 public class SummonCommand extends Command {
 
     private final ArgumentEntityType entity;
     private final ArgumentRelativeVec3 pos;
+    private final ArgumentEnum<EntityClass> entityClass;
 
     public SummonCommand() {
         super("summon");
@@ -21,12 +26,36 @@ public class SummonCommand extends Command {
 
         entity = ArgumentType.EntityType("entity type");
         pos = ArgumentType.RelativeVec3("pos");
-        addSyntax(this::execute, entity, pos);
+        entityClass = ArgumentType.Enum("class", EntityClass.class);
+        entityClass.setFormat(ArgumentEnum.Format.LOWER_CASED);
+        entityClass.setDefaultValue(EntityClass.CREATURE);
+        addSyntax(this::execute, entity, pos, entityClass);
+        setDefaultExecutor((sender, context) -> sender.sendMessage("Usage: /summon <type> <x> <y> <z> <class>"));
     }
 
     private void execute(@NotNull CommandSender commandSender, @NotNull CommandContext commandContext) {
-        final Entity entity = new Entity(commandContext.get(this.entity));
+        final Entity entity = commandContext.get(entityClass).instantiate(commandContext.get(this.entity));
         //noinspection ConstantConditions - One couldn't possibly execute a command without being in an instance
         entity.setInstance(commandSender.asPlayer().getInstance(), commandContext.get(pos).from(commandSender.asPlayer()).toPosition());
     }
+
+    @SuppressWarnings("unused")
+    enum EntityClass {
+        BASE(Entity::new),
+        LIVING(LivingEntity::new),
+        CREATURE(EntityCreature::new);
+        private final EntityFactory factory;
+
+        EntityClass(EntityFactory factory) {
+            this.factory = factory;
+        }
+
+        public Entity instantiate(EntityType type) {
+            return factory.newInstance(type);
+        }
+    }
+
+    interface EntityFactory {
+        Entity newInstance(EntityType type);
+    }
 }