diff --git a/Raylib-cs/Raylib.cs b/Raylib-cs/Raylib.cs
index 0e00751..5527c7f 100644
--- a/Raylib-cs/Raylib.cs
+++ b/Raylib-cs/Raylib.cs
@@ -1897,6 +1897,7 @@ namespace Raylib_cs
 
         // Material loading/unloading functions
 
+        //TODO: safe Helper method
         /// <summary>Load materials from model file</summary>
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Material* LoadMaterials(string fileName, ref int materialCount);
@@ -2194,10 +2195,12 @@ namespace Raylib_cs
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void WaveCrop(ref Wave wave, int initSample, int finalSample);
 
+        //TODO: Span
         /// <summary>Get samples data from wave as a floats array</summary>
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern float* LoadWaveSamples(Wave wave);
 
+        //TODO: Span
         /// <summary>Unload samples data loaded with LoadWaveSamples()</summary>
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern void UnloadWaveSamples(float* samples);
@@ -2208,6 +2211,7 @@ namespace Raylib_cs
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Music LoadMusicStream(string fileName);
 
+        //TODO: Span/Helper method
         /// <summary>Load music stream from data</summary>
         [DllImport(nativeLibName, CallingConvention = CallingConvention.Cdecl)]
         public static extern Music LoadMusicStreamFromMemory(string fileType, byte* data, int dataSize);
diff --git a/Raylib-cs/types/Audio.cs b/Raylib-cs/types/Audio.cs
index 83a601c..0b6f476 100644
--- a/Raylib-cs/types/Audio.cs
+++ b/Raylib-cs/types/Audio.cs
@@ -28,7 +28,8 @@ namespace Raylib_cs
         /// Number of channels (1-mono, 2-stereo)
         /// </summary>
         public uint channels;
-
+        
+        //TODO: SPAN<byte>  ?
         /// <summary>
         /// Buffer data pointer
         /// </summary>
@@ -42,6 +43,7 @@ namespace Raylib_cs
     [StructLayout(LayoutKind.Sequential)]
     public struct AudioStream
     {
+        //TODO: convert
         /// <summary>
         /// Pointer to internal data(rAudioBuffer *) used by the audio system
         /// </summary>
@@ -107,6 +109,7 @@ namespace Raylib_cs
         /// </summary>
         public int ctxType;
 
+        //TODO span
         /// <summary>
         /// Audio context data, depends on type
         /// </summary>
diff --git a/Raylib-cs/types/Material.cs b/Raylib-cs/types/Material.cs
index 0f72c8e..c36e2e6 100644
--- a/Raylib-cs/types/Material.cs
+++ b/Raylib-cs/types/Material.cs
@@ -78,10 +78,11 @@ namespace Raylib_cs
         /// </summary>
         public Shader shader;
 
+        //TODO: convert
         /// <summary>
         /// Material maps
         /// </summary>
-        public MaterialMap *maps;
+        public MaterialMap* maps;
 
         /// <summary>
         /// Material generic parameters (if required)
diff --git a/Raylib-cs/types/Model.cs b/Raylib-cs/types/Model.cs
index 77d220b..cfa10b4 100644
--- a/Raylib-cs/types/Model.cs
+++ b/Raylib-cs/types/Model.cs
@@ -62,11 +62,13 @@ namespace Raylib_cs
         /// </summary>
         public int boneCount;
 
+        //TODO: Span
         /// <summary>
         /// Bones information (skeleton, BoneInfo *)
         /// </summary>
         public BoneInfo* bones;
 
+        //TODO: Span
         /// <summary>
         /// Bones base transformation (pose, Transform *)
         /// </summary>
@@ -88,7 +90,7 @@ namespace Raylib_cs
         /// Number of animation frames
         /// </summary>
         public readonly int frameCount;
-
+        
         /// <summary>
         /// Bones information (skeleton, BoneInfo *)
         /// </summary>