diff --git a/Source/Engine/Networking/INetworkDriver.h b/Source/Engine/Networking/INetworkDriver.h
index 749836d5a..2bf7b32fd 100644
--- a/Source/Engine/Networking/INetworkDriver.h
+++ b/Source/Engine/Networking/INetworkDriver.h
@@ -4,7 +4,7 @@
 
 #include "Engine/Scripting/ScriptingType.h"
 
-API_INTERFACE() class FLAXENGINE_API INetworkDriver
+API_INTERFACE(Namespace="FlaxEngine.Networking") class FLAXENGINE_API INetworkDriver
 {
 DECLARE_SCRIPTING_TYPE_MINIMAL(INetworkDriver);
 public:
diff --git a/Source/Engine/Networking/NetworkChannelType.h b/Source/Engine/Networking/NetworkChannelType.h
index 57ace04ab..ae1b388f9 100644
--- a/Source/Engine/Networking/NetworkChannelType.h
+++ b/Source/Engine/Networking/NetworkChannelType.h
@@ -4,7 +4,7 @@
 
 #include "Engine/Scripting/ScriptingType.h"
 
-API_ENUM() enum class NetworkChannelType
+API_ENUM(Namespace="FlaxEngine.Networking") enum class NetworkChannelType
 {
     None = 0,
     
diff --git a/Source/Engine/Networking/NetworkConfig.h b/Source/Engine/Networking/NetworkConfig.h
index 64958fad9..84ee12761 100644
--- a/Source/Engine/Networking/NetworkConfig.h
+++ b/Source/Engine/Networking/NetworkConfig.h
@@ -2,16 +2,24 @@
 
 #pragma once
 
-API_STRUCT() struct FLAXENGINE_API NetworkConfig
+API_STRUCT(Namespace="FlaxEngine.Networking") struct FLAXENGINE_API NetworkConfig
 {
 DECLARE_SCRIPTING_TYPE_MINIMAL(NetworkConfig);
 public:
-    INetworkDriver* NetworkDriver = nullptr;
+    API_FIELD()
+    INetworkDriver* NetworkDriver = nullptr; // TODO: Pass by ref not pointer (?)
 
 public:
+    API_FIELD()
     uint16 ConnectionsLimit = 32;
+    
+    API_FIELD()
     uint16 Port = 7777;
+    
+    API_FIELD()
     uint16 MessageSize = 1500; // MTU
+    
+    API_FIELD()
     uint16 MessagePoolSize = 2048; // (RX and TX)
 
     // TODO: End point for server/client
diff --git a/Source/Engine/Networking/NetworkConnection.h b/Source/Engine/Networking/NetworkConnection.h
index 1c9170baf..3ee688f41 100644
--- a/Source/Engine/Networking/NetworkConnection.h
+++ b/Source/Engine/Networking/NetworkConnection.h
@@ -4,7 +4,7 @@
 
 #include "Engine/Scripting/ScriptingType.h"
 
-API_STRUCT() struct FLAXENGINE_API NetworkConnection
+API_STRUCT(Namespace="FlaxEngine.Networking") struct FLAXENGINE_API NetworkConnection
 {
 DECLARE_SCRIPTING_TYPE_MINIMAL(NetworkConnection);
 public:
diff --git a/Source/Engine/Networking/NetworkEvent.h b/Source/Engine/Networking/NetworkEvent.h
index 98f4ce7c0..03fb1cdd9 100644
--- a/Source/Engine/Networking/NetworkEvent.h
+++ b/Source/Engine/Networking/NetworkEvent.h
@@ -4,7 +4,7 @@
 
 #include "Engine/Scripting/ScriptingType.h"
 
-API_ENUM() enum class NetworkEventType
+API_ENUM(Namespace="FlaxEngine.Networking") enum class NetworkEventType
 {
     Undefined = 0,
 
@@ -15,7 +15,7 @@ API_ENUM() enum class NetworkEventType
     Error
 };
 
-API_STRUCT() struct FLAXENGINE_API NetworkEvent
+API_STRUCT(Namespace="FlaxEngine.Networking") struct FLAXENGINE_API NetworkEvent
 {
 DECLARE_SCRIPTING_TYPE_MINIMAL(NetworkEvent);
 public:
diff --git a/Source/Engine/Networking/NetworkManager.h b/Source/Engine/Networking/NetworkManager.h
index 25baf40f5..83e7f5de6 100644
--- a/Source/Engine/Networking/NetworkManager.h
+++ b/Source/Engine/Networking/NetworkManager.h
@@ -5,7 +5,7 @@
 #include "Engine/Scripting/ScriptingType.h"
 #include "Types.h"
 
-API_CLASS(Static) class FLAXENGINE_API NetworkManager
+API_CLASS(Namespace="FlaxEngine.Networking", Static) class FLAXENGINE_API NetworkManager
 {
 DECLARE_SCRIPTING_TYPE_NO_SPAWN(NetworkManager);
 public:
diff --git a/Source/Engine/Networking/NetworkMessage.h b/Source/Engine/Networking/NetworkMessage.h
index ce02caeea..36646cebe 100644
--- a/Source/Engine/Networking/NetworkMessage.h
+++ b/Source/Engine/Networking/NetworkMessage.h
@@ -4,7 +4,7 @@
 
 #include "Engine/Scripting/ScriptingType.h"
 
-API_STRUCT() struct FLAXENGINE_API NetworkMessage
+API_STRUCT(Namespace="FlaxEngine.Networking") struct FLAXENGINE_API NetworkMessage
 {
 DECLARE_SCRIPTING_TYPE_MINIMAL(NetworkMessage);
 public: