diff --git a/src/safe_array.c b/src/safe_array.c
index 53714b1..da16d06 100644
--- a/src/safe_array.c
+++ b/src/safe_array.c
@@ -10,7 +10,10 @@
  *
  * THE SOFTWARE IS PROVIDED “AS IS”, WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
 */
-#include "safe_array.h"
+//#include "safe_array.h"
+#include <stdint.h>
+#include <stdlib.h>
+#include <stdio.h>
 
 /**
  * @brief This function generates a safe array
@@ -19,6 +22,38 @@
  * @param rows The number of rows in the array
  * @return array_t* The pointer to the safe array struct
  */
+
+typedef struct array_s
+{
+    size_t rows;
+    size_t size;
+    uint8_t data[1];
+} array_t;
+
+typedef struct array_2d_s
+{
+    size_t rows;
+    size_t cols;
+    size_t size;
+    uint8_t data[1];
+} array_2d_t;
+
+typedef struct array_c_s
+{
+    size_t rows;
+    size_t size;
+    void *real;
+    void *imaginary;
+} array_c_s_t;
+
+typedef struct array_c_p_s
+{
+    size_t rows;
+    size_t size;
+    void *magnitude;
+    void *phase;
+} array_c_p_t;
+
 array_t *array_init(size_t size, size_t rows)
 {
     array_t *arr = calloc(sizeof(array_t) + (size * rows - 1), 1);
@@ -57,6 +92,17 @@ void *array_get(array_t *arr, size_t index)
     return (char *)arr->data + (index * arr->size);
 }
 
+size_t array_get_rows(array_t *arr)
+{
+    if (!arr)
+    {
+        fprintf(stderr, "%s: Invalid argument\n", __func__);
+        return 0;
+    }
+
+    return arr->rows;
+}
+
 /**
  * @brief This function sets an element in the safe array
  * 
@@ -122,6 +168,40 @@ array_2d_t *array_2d_init(size_t size, size_t rows, size_t cols)
     return arr;
 }
 
+/**
+ * @brief This function gets the number of rows in the 2D safe array
+ *
+ * @param x The pointer to the 2D array struct
+ * @return size_t The number of rows
+ */
+size_t array_2d_get_rows(array_2d_t *x)
+{
+    if (!x)
+    {
+        fprintf(stderr, "%s: ptr dereferences to NULL\n", __func__);
+        return 0;
+    }
+
+    return x->rows;
+}
+
+/**
+ * @brief This function gets the number of columns in the 2D safe array
+ *
+ * @param x The pointer to the 2D array struct
+ * @return size_t The number of columns
+ */
+size_t array_2d_get_cols(array_2d_t *x)
+{
+    if (!x)
+    {
+        fprintf(stderr, "%s: ptr dereferences to NULL\n", __func__);
+        return 0;
+    }
+
+    return x->cols;
+}
+
 /**
  * @brief This function gets an element from the 2D safe array
  *
@@ -229,6 +309,23 @@ array_c_s_t *array_c_s_init(size_t rows, size_t size)
     return x;
 }
 
+/**
+ * @brief This function gets the number of rows in the complex safe array
+ *
+ * @param x The pointer to the complex array struct
+ * @return size_t The number of rows
+ */
+size_t array_c_s_get_rows(array_c_s_t *x)
+{
+    if (!x)
+    {
+        fprintf(stderr, "%s: ptr dereferences to NULL\n", __func__);
+        return 0;
+    }
+
+    return x->rows;
+}
+
 /**
  * @brief This function gets an imaginary element from the complex safe array
  * 
@@ -339,6 +436,23 @@ array_c_p_t *array_c_p_init(size_t rows, size_t size)
     return x;
 }
 
+/**
+ * @brief This function gets the number of rows in the complex safe array
+ *
+ * @param x The pointer to the complex array struct
+ * @return size_t The number of rows
+ */
+size_t array_c_p_get_rows(array_c_p_t *x)
+{
+    if (!x)
+    {
+        fprintf(stderr, "%s: ptr dereferences to NULL\n", __func__);
+        return 0;
+    }
+
+    return x->rows;
+}
+
 void* array_c_get_mag(array_c_p_t *x, size_t row)
 {
     if (row >= x->rows)
diff --git a/src/safe_array.h b/src/safe_array.h
index e5c5cbc..665a945 100644
--- a/src/safe_array.h
+++ b/src/safe_array.h
@@ -23,55 +23,34 @@
 #define ARRAY_C_GET_MAG(arr, row, type) (*(type *)array_c_get_mag(arr, row))
 #define ARRAY_C_GET_PHASE(arr, row, type) (*(type *)array_c_get_phase(arr, row))
 
-typedef struct array_s
-{
-    size_t rows;
-    size_t size;
-    uint8_t data[1];
-} array_t;
-
-typedef struct array_2d_s
-{
-    size_t rows;
-    size_t cols;
-    size_t size;
-    uint8_t data[1];
-} array_2d_t;
-
-typedef struct array_c_s
-{
-    size_t rows;
-    size_t size;
-    void *real;
-    void *imaginary;
-} array_c_s_t;
-
-typedef struct array_c_p_s
-{
-    size_t rows;
-    size_t size;
-    void *magnitude;
-    void *phase;
-} array_c_p_t;
+typedef void array_t;
+typedef void array_2d_t;
+typedef void array_c_s_t;
+typedef void array_c_p_t;
 
 // Array.c
 array_t *array_init(size_t size, size_t rows);
+size_t array_get_rows(array_t *arr);
 void *array_get(array_t *arr, size_t index);
 int array_set(array_t *arr, size_t index, void *element);
 void array_free(array_t *arr);
 
 array_2d_t *array_2d_init(size_t size, size_t rows, size_t cols);
+size_t array_2d_get_rows(array_2d_t *x);
+size_t array_2d_get_cols(array_2d_t *x);
 void *array_2d_get(array_2d_t *x, size_t row, size_t col);
 int array_2d_set(array_2d_t *x, size_t row, size_t col, void *val);
 void array_2d_free(array_2d_t *x);
 
 array_c_s_t *array_c_s_init(size_t rows, size_t size);
+size_t array_c_s_get_rows(array_c_s_t *x);
 void* array_c_get_real(array_c_s_t *x, size_t row);
 void* array_c_get_imag(array_c_s_t *x, size_t row);
 int array_c_s_set(array_c_s_t *x, size_t row, void *real, void *imaginary);
 void array_c_s_free(array_c_s_t *x);
 
 array_c_p_t *array_c_p_init(size_t rows, size_t size);
+size_t array_c_p_get_rows(array_c_p_t *x);
 void *array_c_get_mag(array_c_p_t *x, size_t row);
 void *array_c_get_phase(array_c_p_t *x, size_t row);
 int array_c_p_set(array_c_p_t *x, size_t row, void* magnitude, void* phase);
diff --git a/tests/safe_array.cpp b/tests/safe_array.cpp
index caec5f1..16a02ba 100644
--- a/tests/safe_array.cpp
+++ b/tests/safe_array.cpp
@@ -3,7 +3,7 @@
 TEST(array, array_init)
 {
     array_t* x = array_init(sizeof(double), 2);
-    EXPECT_EQ(x->rows, 2);
+    EXPECT_EQ(array_get_rows(x), 2);
     EXPECT_EQ(ARRAY_GET(x, 0, double), 0);
     EXPECT_EQ(ARRAY_GET(x, 0, double), 0);
     array_free(x);
@@ -37,8 +37,8 @@ TEST(array, Get_Set_array)
 TEST(array, array_2d_init)
 {
     array_2d_t* x = array_2d_init(sizeof(double), 2, 2);
-    EXPECT_EQ(x->rows, 2);
-    EXPECT_EQ(x->cols, 2);
+    EXPECT_EQ(array_2d_get_rows(x), 2);
+    EXPECT_EQ(array_2d_get_cols(x), 2);
     EXPECT_EQ(ARRAY_2D_GET(x, 0, 0, double), 0);
     EXPECT_EQ(ARRAY_2D_GET(x, 0, 0, double), 0);
     EXPECT_EQ(ARRAY_2D_GET(x, 0, 0, double), 0);
@@ -90,7 +90,7 @@ TEST(array, Set_Get_array_2d)
 TEST(array, array_c_s_init)
 {
     array_c_s_t* x = array_c_s_init(2, sizeof(double));
-    EXPECT_EQ(x->rows, 2);
+    EXPECT_EQ(array_c_s_get_rows(x), 2);
     EXPECT_EQ(ARRAY_C_GET_REAL(x, 0, double), 0);
     EXPECT_EQ(ARRAY_C_GET_REAL(x, 1, double), 0);
     EXPECT_EQ(ARRAY_C_GET_IMAG(x, 0, double), 0);
@@ -134,7 +134,7 @@ TEST(array, Set_Get_array_C_S)
 TEST(array, array_c_p_init)
 {
     array_c_p_t* x = array_c_p_init(2, sizeof(double));
-    EXPECT_EQ(x->rows, 2);
+    EXPECT_EQ(array_c_p_get_rows(x), 2);
     EXPECT_EQ(ARRAY_C_GET_MAG(x, 0, double), 0);
     EXPECT_EQ(ARRAY_C_GET_MAG(x, 1, double), 0);
     EXPECT_EQ(ARRAY_C_GET_PHASE(x, 0, double), 0);