diff --git a/src/nanoFramework.System.Collections/nf_system_collections.cpp b/src/nanoFramework.System.Collections/nf_system_collections.cpp
index bb787babcf..d797b80380 100644
--- a/src/nanoFramework.System.Collections/nf_system_collections.cpp
+++ b/src/nanoFramework.System.Collections/nf_system_collections.cpp
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) .NET Foundation and Contributors
 // See LICENSE file in the project root for full license information.
 //
@@ -9,6 +9,71 @@
 
 static const CLR_RT_MethodHandler method_lookup[] =
 {
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     nullptr,
     nullptr,
     nullptr,
@@ -35,13 +100,13 @@ static const CLR_RT_MethodHandler method_lookup[] =
     nullptr,
     nullptr,
     Library_nf_system_collections_System_Collections_Hashtable::Clear___VOID,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
-    NULL,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
     Library_nf_system_collections_System_Collections_Hashtable::InsertNative___VOID__OBJECT__OBJECT__BOOLEAN__I4,
     Library_nf_system_collections_System_Collections_Hashtable::GetNative___OBJECT__OBJECT__I4,
     Library_nf_system_collections_System_Collections_Hashtable::ContainsNative___BOOLEAN__OBJECT__I4,
@@ -97,14 +162,17 @@ static const CLR_RT_MethodHandler method_lookup[] =
     Library_nf_system_collections_System_Collections_Stack::Push___VOID__OBJECT,
     nullptr,
     nullptr,
+    nullptr,
+    nullptr,
+    nullptr,
 };
 
 const CLR_RT_NativeAssemblyData g_CLR_AssemblyNative_nanoFramework_System_Collections =
 {
     "nanoFramework.System.Collections",
-    0x40DC251F,
+    0xECAABF30,
     method_lookup,
-    { 100, 0, 2, 0 }
+    { 100, 0, 3, 0 }
 };
 
 // clang-format on
diff --git a/src/nanoFramework.System.Collections/nf_system_collections.h b/src/nanoFramework.System.Collections/nf_system_collections.h
index a5f68d4dab..56b5d08410 100644
--- a/src/nanoFramework.System.Collections/nf_system_collections.h
+++ b/src/nanoFramework.System.Collections/nf_system_collections.h
@@ -1,4 +1,4 @@
-//
+//
 // Copyright (c) .NET Foundation and Contributors
 // Portions Copyright (c) Microsoft Corporation.  All rights reserved.
 // See LICENSE file in the project root for full license information.
@@ -20,9 +20,37 @@ struct Library_nf_system_collections_System_Collections_Bucket
     //--//
 };
 
+struct Library_nf_system_collections_System_Collections_Generic_ICollectionDebugView_1
+{
+    static const int FIELD___collection = 1;
+
+    //--//
+};
+
+struct Library_nf_system_collections_System_Collections_Generic_List_1__Enumerator
+{
+    static const int FIELD___list = 1;
+    static const int FIELD___version = 2;
+    static const int FIELD___index = 3;
+    static const int FIELD___current = 4;
+
+    //--//
+};
+
+struct Library_nf_system_collections_System_Collections_Generic_List_1
+{
+    static const int FIELD_STATIC__s_emptyArray = 0;
+
+    static const int FIELD___items = 1;
+    static const int FIELD___size = 2;
+    static const int FIELD___version = 3;
+
+    //--//
+};
+
 struct Library_nf_system_collections_System_Collections_Hashtable
 {
-    static const int FIELD_STATIC___syncLock = 0;
+    static const int FIELD_STATIC___syncLock = 1;
 
     static const int FIELD___buckets = 1;
     static const int FIELD___loadsize = 2;