diff --git a/src/main/java/nl/sander/beejava/TypeMapper.java b/src/main/java/nl/sander/beejava/TypeMapper.java
index 35a62cc..2e22b4f 100644
--- a/src/main/java/nl/sander/beejava/TypeMapper.java
+++ b/src/main/java/nl/sander/beejava/TypeMapper.java
@@ -8,12 +8,19 @@ public class TypeMapper {
     private static final Map<Class<?>, String> MAP = new ConcurrentHashMap<>();
 
     static {
+        MAP.put(byte.class, "B");
+        MAP.put(char.class, "C");
+        MAP.put(double.class, "D");
+        MAP.put(float.class, "F");
         MAP.put(int.class, "I");
+        MAP.put(long.class, "J");
+        MAP.put(short.class, "S");
+        MAP.put(boolean.class, "Z");
     }
 
     public static String map(Class<?> type) {
         return Optional.ofNullable(MAP.get(type))
-                .orElseThrow(() -> new RuntimeException("Type " + type.getName() + " not found")); //this MUST not happen -> TODO map all types
+                .orElseThrow(() -> new RuntimeException("Type " + type.getName() + " not found")); // this MUST not happen -> TODO map all types
     }