diff --git a/src/primitives/array/array.h b/src/primitives/array/array.h
index 157317e..4658bec 100644
--- a/src/primitives/array/array.h
+++ b/src/primitives/array/array.h
@@ -18,7 +18,7 @@ BEGIN_C_LINKAGE
 #define _calc_array_capacity(TYPE, ...) wapp_misc_utils_u64_round_up_pow2(_calc_array_count(TYPE, __VA_ARGS__) * 2)
 
 #define wapp_array_alloc_capacity(ELEM_TYPE, ARRAY_TYPE, ALLOCATOR_PTR, CAPACITY) \
-	((ARRAY_TYPE *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(ELEM_TYPE)))
+  ((ARRAY_TYPE *)_array_alloc_capacity(ALLOCATOR_PTR, CAPACITY, sizeof(ELEM_TYPE)))
 
 #define WAPP_DEF_ARRAY_TYPE(T, NAME) \
   typedef struct {                   \
@@ -131,11 +131,28 @@ void  *_array_pop(Array *array, u64 item_size);
 void   _array_clear(Array *array, u64 item_size);
 Array *_array_alloc_capacity(const Allocator *allocator, u64 capacity, u64 item_size);
 
+// Base array types
 typedef struct str8 Str8;
 
-WAPP_DEF_ARRAY_TYPE(u8, U8Array);
-WAPP_DEF_ARRAY_TYPE(i32, I32Array);
-WAPP_DEF_ARRAY_TYPE(Str8, Str8Array);
+WAPP_DEF_ARRAY_TYPE(void *, VoidPtrArray);
+WAPP_DEF_ARRAY_TYPE(c8    , C8Array);
+WAPP_DEF_ARRAY_TYPE(c16   , C16Array);
+WAPP_DEF_ARRAY_TYPE(c32   , C32Array);
+WAPP_DEF_ARRAY_TYPE(u8    , U8Array);
+WAPP_DEF_ARRAY_TYPE(u16   , U16Array);
+WAPP_DEF_ARRAY_TYPE(u32   , U32Array);
+WAPP_DEF_ARRAY_TYPE(u64   , U64Array);
+WAPP_DEF_ARRAY_TYPE(b8    , B8Array);
+WAPP_DEF_ARRAY_TYPE(i8    , I8Array);
+WAPP_DEF_ARRAY_TYPE(i16   , I16Array);
+WAPP_DEF_ARRAY_TYPE(i32   , I32Array);
+WAPP_DEF_ARRAY_TYPE(i64   , I64Array);
+WAPP_DEF_ARRAY_TYPE(f32   , F32Array);
+WAPP_DEF_ARRAY_TYPE(f64   , F64Array);
+WAPP_DEF_ARRAY_TYPE(f128  , F128Array);
+WAPP_DEF_ARRAY_TYPE(uptr  , UptrArray);
+WAPP_DEF_ARRAY_TYPE(iptr  , IptrArray);
+WAPP_DEF_ARRAY_TYPE(Str8  , Str8Array);
 
 #ifdef WAPP_PLATFORM_CPP
 END_C_LINKAGE