7 files changed, 35 insertions, 32 deletions
diff --git a/Data/BuiltIn/Libraries/GameLab/Class.lua b/Data/BuiltIn/Libraries/GameLab/Class.lua
index db8e2b2..e30aab7 100644
--- a/Data/BuiltIn/Libraries/GameLab/Class.lua
+++ b/Data/BuiltIn/Libraries/GameLab/Class.lua
@@ -5,6 +5,7 @@
 
 local TRACKCLASSINSTANCES = false
 local PROPERTY = true
+local METADATA = true
 
 local index = function(self, key) 
     local c = getmetatable(self)
@@ -43,13 +44,15 @@ local newclass = function (name, ctor)
         pkg = string.match(name, "^(.+)%.%w+$")
         short = string.match(name, "%.*(%w+)$")
     end 
-    
-    c._type = { 
-        mode = "lua",
-        name = short,
-        package = pkg,
-        fullName = name
-    }
+        
+    if METADATA then
+        c._type = { 
+            mode = "lua",
+            name = short,
+            package = pkg,
+            fullName = name
+        }
+    end 
 
     if PROPERTY then 
         c.__index = index
diff --git a/Data/BuiltIn/Libraries/GameLab/Containers/init.lua b/Data/BuiltIn/Libraries/GameLab/Containers/init.lua
index 685c95a..a121278 100644
--- a/Data/BuiltIn/Libraries/GameLab/Containers/init.lua
+++ b/Data/BuiltIn/Libraries/GameLab/Containers/init.lua
@@ -1,7 +1,7 @@
 local m = GameLab.Package("GameLab.Containers")
 local import = GameLab.Import(...)
 
-import("Tuple")
-import("Array")
+import "Tuple"
+import "Array"
 
 return m
 \ No newline at end of file
diff --git a/Data/BuiltIn/Libraries/GameLab/Engine/Math/init.lua b/Data/BuiltIn/Libraries/GameLab/Engine/Math/init.lua
index e7c0164..71523d5 100644
--- a/Data/BuiltIn/Libraries/GameLab/Engine/Math/init.lua
+++ b/Data/BuiltIn/Libraries/GameLab/Engine/Math/init.lua
@@ -2,14 +2,14 @@ local math = GameLab.Package("GameLab.Engine.Math")
 
 local import = GameLab.Import(...)
 
-import("Math")
-import("Vector2")
-import("Vector3")
-import("Vector4")
-import("Matrix44")
-import("Matrix33")
-import("Quaternion")
-import("Rect")
+import "Math"
+import "Vector2"
+import "Vector3"
+import "Vector4"
+import "Matrix44"
+import "Matrix33"
+import "Quaternion"
+import "Rect"
 
 GameLab.Debug.Log("GameLab.Engine.Math loaded")
 
diff --git a/Data/BuiltIn/Libraries/GameLab/Engine/Rendering/init.lua b/Data/BuiltIn/Libraries/GameLab/Engine/Rendering/init.lua
index 68441ab..9966ea2 100644
--- a/Data/BuiltIn/Libraries/GameLab/Engine/Rendering/init.lua
+++ b/Data/BuiltIn/Libraries/GameLab/Engine/Rendering/init.lua
@@ -4,9 +4,9 @@ local import = GameLab.Import(...)
 
 local Shader = GameLab.Engine.Rendering.Shader
 
-m.Color = import("Color")
-m.Color32 = import("Color32")
-m.Shader = import("Shader")
+m.Color   = import "Color"
+m.Color32 = import "Color32"
+m.Shader  = import "Shader"
 
 m.LoadTexture = function(path) 
 
diff --git a/Data/BuiltIn/Libraries/GameLab/Engine/Resource/init.lua b/Data/BuiltIn/Libraries/GameLab/Engine/Resource/init.lua
index feff63f..63eb9b6 100644
--- a/Data/BuiltIn/Libraries/GameLab/Engine/Resource/init.lua
+++ b/Data/BuiltIn/Libraries/GameLab/Engine/Resource/init.lua
@@ -13,7 +13,7 @@ local import = GameLab.Import(...)
 ----------------------------------------------------------------------------------
 -- classes
 ----------------------------------------------------------------------------------
-m.ImageDataRequest = import("ImageDataRequest")
+m.ImageDataRequest = import "ImageDataRequest"
 
 ----------------------------------------------------------------------------------
 -- methods
diff --git a/Data/BuiltIn/Libraries/GameLab/Events/init.lua b/Data/BuiltIn/Libraries/GameLab/Events/init.lua
index 7bfb648..54c2612 100644
--- a/Data/BuiltIn/Libraries/GameLab/Events/init.lua
+++ b/Data/BuiltIn/Libraries/GameLab/Events/init.lua
@@ -1,6 +1,6 @@
 local Events = GameLab.Package("GameLab.Events") 
 local import = GameLab.Import(...)
 
-import("Event")
+import "Event" 
 
 return Events 
 \ No newline at end of file
diff --git a/Data/BuiltIn/Libraries/GameLab/init.lua b/Data/BuiltIn/Libraries/GameLab/init.lua
index 7305b9d..b0c3780 100644
--- a/Data/BuiltIn/Libraries/GameLab/init.lua
+++ b/Data/BuiltIn/Libraries/GameLab/init.lua
@@ -29,15 +29,15 @@ end
 
 local import = GameLab.Import(...)
 
-import("Package")
-import("Class")
-import("GlobalClass")
-import("Enum")
-import("GlobalEnum")
-import("GlobalTable")
-import("Delegate")
-import("EventListener")
-import("StaticClass")
-import("GlobalStaticClass")
+import "Package"
+import "Class"
+import "GlobalClass"
+import "Enum"
+import "GlobalEnum"
+import "GlobalTable"
+import "Delegate"
+import "EventListener"
+import "StaticClass"
+import "GlobalStaticClass"
 
 return GameLab
 \ No newline at end of file