diff --git a/entities/weapons/quantum_hands/shared.lua b/entities/weapons/quantum_hands/shared.lua
index adbd4d5..9ab83d7 100644
--- a/entities/weapons/quantum_hands/shared.lua
+++ b/entities/weapons/quantum_hands/shared.lua
@@ -109,9 +109,9 @@ function SWEP:SecondaryAttack()
 
 	if SERVER then
 		local hitposEnt = self:GetOwner():GetEyeTraceNoCursor().Entity
-		if( Quantum.Server.DoorClasses[hitposEnt:GetClass()] && IsValid(hitposEnt) ) then -- if it is a door
+		if( Quantum.DoorClasses[hitposEnt:GetClass()] && IsValid(hitposEnt) ) then -- if it is a door
 			if( hitposEnt:GetPos():Distance(self:GetOwner():GetPos()) <= 90 ) then
-				Quantum.Server.Property.PlayerSwitchLock( self:GetOwner(), hitposEnt ) -- then try to unlock/lock it
+				Quantum.Property.PlayerSwitchLock( self:GetOwner(), hitposEnt ) -- then try to unlock/lock it
 			end
 		end
 	end
diff --git a/gamemode/cl_init.lua b/gamemode/cl_init.lua
index 8c7fcf4..519b152 100644
--- a/gamemode/cl_init.lua
+++ b/gamemode/cl_init.lua
@@ -52,6 +52,7 @@ if CLIENT then
 		include( "settings/sh_crafting_stations.lua" )
 		include( "settings/sh_recipes.lua" )
 		include( "settings/sh_nodes.lua" )
+		include( "settings/sh_properties.lua" )
 	end
 
 	local function loadPlugins()
diff --git a/gamemode/init.lua b/gamemode/init.lua
index 4366283..a911cae 100644
--- a/gamemode/init.lua
+++ b/gamemode/init.lua
@@ -17,6 +17,7 @@ if SERVER then
 	AddCSLuaFile( "settings/sh_recipes.lua" )
 	AddCSLuaFile( "settings/sh_crafting_stations.lua" )
 	AddCSLuaFile( "settings/sh_nodes.lua" )
+	AddCSLuaFile( "settings/sh_properties.lua" )
 
 	AddCSLuaFile( "cl_init.lua" )
 	AddCSLuaFile( "shared.lua" )
@@ -123,7 +124,7 @@ if SERVER then
 		include( "settings/sv_crafting_stations_locations.lua" )
 		include( "settings/sh_nodes.lua" )
 		include( "settings/sv_nodes_locations.lua" )
-		include( "settings/sv_properties.lua" )
+		include( "settings/sh_properties.lua" )
 
 		Quantum.Server.Station.UpdateAll()
 	end
diff --git a/gamemode/settings/sh_properties.lua b/gamemode/settings/sh_properties.lua
index fe4cb03..249e244 100644
--- a/gamemode/settings/sh_properties.lua
+++ b/gamemode/settings/sh_properties.lua
@@ -5,7 +5,7 @@
 --  \ \   / ____ \| | | | | | | |  __/ (__| | | |  / / 
 --   \_\ /_/    \_\_|_| |_| |_|_|\___|\___|_| |_| /_/  
 
-Quantum.Server.Property.Register( "house1", {
+Quantum.Property.Register( "house1", {
 	name = "Red House",
 	price = 10000,
 	vec1 = Vector( 761.43292236328, -3089.3618164063, 200.19812011719 ),