diff --git a/native/Cargo.lock b/native/Cargo.lock
index a5d1380..71417b9 100644
--- a/native/Cargo.lock
+++ b/native/Cargo.lock
@@ -108,9 +108,9 @@ dependencies = [
 
 [[package]]
 name = "darling"
-version = "0.20.3"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "0209d94da627ab5605dcccf08bb18afa5009cfbef48d8a8b7d7bdbc79be25c5e"
+checksum = "6f63b86c8a8826a49b8c21f08a2d07338eec8d900540f8630dc76284be802989"
 dependencies = [
  "darling_core",
  "darling_macro",
@@ -118,9 +118,9 @@ dependencies = [
 
 [[package]]
 name = "darling_core"
-version = "0.20.3"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "177e3443818124b357d8e76f53be906d60937f0d3a90773a664fa63fa253e621"
+checksum = "95133861a8032aaea082871032f5815eb9e98cef03fa916ab4500513994df9e5"
 dependencies = [
  "fnv",
  "ident_case",
@@ -132,9 +132,9 @@ dependencies = [
 
 [[package]]
 name = "darling_macro"
-version = "0.20.3"
+version = "0.20.10"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "836a9bbc7ad63342d6d6e7b815ccab164bc77a2d95d84bc3117a8c0d5c98e2d5"
+checksum = "d336a2a514f6ccccaa3e09b02d41d35330c07ddf03a62165fcec10bb561c7806"
 dependencies = [
  "darling_core",
  "quote",
@@ -283,7 +283,7 @@ dependencies = [
 [[package]]
 name = "godot-rust-script"
 version = "0.1.0"
-source = "git+https://github.com/titannano/godot-rust-script?rev=501596ccbec7019632221d2218ab1806f973c412#501596ccbec7019632221d2218ab1806f973c412"
+source = "git+https://github.com/titannano/godot-rust-script?rev=91c51296bc47a99db4c632f8b50780bed3d512b2#91c51296bc47a99db4c632f8b50780bed3d512b2"
 dependencies = [
  "const-str",
  "godot",
@@ -298,7 +298,7 @@ dependencies = [
 [[package]]
 name = "godot-rust-script-derive"
 version = "0.1.0"
-source = "git+https://github.com/titannano/godot-rust-script?rev=501596ccbec7019632221d2218ab1806f973c412#501596ccbec7019632221d2218ab1806f973c412"
+source = "git+https://github.com/titannano/godot-rust-script?rev=91c51296bc47a99db4c632f8b50780bed3d512b2#91c51296bc47a99db4c632f8b50780bed3d512b2"
 dependencies = [
  "darling",
  "proc-macro2",
@@ -692,9 +692,9 @@ checksum = "d29ab0c6d3fc0ee92fe66e2d99f700eab17a8d57d1c1d3b748380fb20baa78cd"
 
 [[package]]
 name = "strsim"
-version = "0.10.0"
+version = "0.11.1"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "73473c0e59e6d5812c5dfe2a064a6444949f089e20eec9a2e5506596494e4623"
+checksum = "7da8b5736845d9f2fcb837ea5d9e2628564b3b043a70948a3f0b778838c5fb4f"
 
 [[package]]
 name = "syn"
diff --git a/native/Cargo.toml b/native/Cargo.toml
index 4317327..9cecaa0 100644
--- a/native/Cargo.toml
+++ b/native/Cargo.toml
@@ -21,4 +21,4 @@ rand = "0.8.5"
 pomsky-macro = "0.11.0"
 regex = "1.10.5"
 
-godot-rust-script = { git = "https://github.com/titannano/godot-rust-script", rev = "501596ccbec7019632221d2218ab1806f973c412" }
+godot-rust-script = { git = "https://github.com/titannano/godot-rust-script", rev = "91c51296bc47a99db4c632f8b50780bed3d512b2" }
diff --git a/native/src/scripts/objects/building.rs b/native/src/scripts/objects/building.rs
index 1da1417..0a40cb5 100644
--- a/native/src/scripts/objects/building.rs
+++ b/native/src/scripts/objects/building.rs
@@ -1,11 +1,11 @@
 use godot::{
-    builtin::{math::ApproxEq, Array, NodePath, Transform3D, Vector3},
+    builtin::{math::ApproxEq, Array, Transform3D, Vector3},
     engine::{MeshInstance3D, Node, Node3D, PackedScene, Time},
     meta::ToGodot,
     obj::{Gd, Inherits},
     tools::load,
 };
-use godot_rust_script::{godot_script_impl, CastToScript, Context, GodotScript, RsRef};
+use godot_rust_script::{godot_script_impl, CastToScript, GodotScript, RsRef};
 use rand::Rng;
 use std::{any::Any, fmt::Debug};
 
@@ -203,14 +203,13 @@ struct Building {
     #[export(flags = ["Fire:1"])]
     pub events: u8,
 
-    #[export(node_path = ["MeshInstance3D"])]
-    pub mesh_path: NodePath,
+    #[export]
+    pub mesh: Option<Gd<MeshInstance3D>>,
 
     pub tile_coords_array: Array<u32>,
 
     tile_coords: TileCoords,
 
-    mesh: Option<Gd<MeshInstance3D>>,
     features: Features<dyn BuildingFeature<Node>>,
 
     base: Gd<Node>,
@@ -218,17 +217,9 @@ struct Building {
 
 #[godot_script_impl]
 impl Building {
-    pub fn _ready(&mut self, mut context: Context<Self>) {
+    pub fn _ready(&mut self) {
         let events = BuildingEventFlags(self.events);
 
-        self.mesh = {
-            let mesh_path = self.mesh_path.clone();
-
-            context.reentrant_scope(self, |base: Gd<Node>| {
-                base.try_get_node_as(mesh_path.to_owned())
-            })
-        };
-
         self.tile_coords = (
             self.tile_coords_array.get(0).unwrap_or(0),
             self.tile_coords_array.get(1).unwrap_or(0),
diff --git a/native/src/scripts/objects/canon_upgrade.rs b/native/src/scripts/objects/canon_upgrade.rs
index 5240b33..eada835 100644
--- a/native/src/scripts/objects/canon_upgrade.rs
+++ b/native/src/scripts/objects/canon_upgrade.rs
@@ -1,6 +1,6 @@
 use anyhow::{bail, Context};
 use godot::{
-    builtin::{NodePath, StringName},
+    builtin::StringName,
     engine::{GpuParticles3D, Node3D},
     obj::Gd,
 };
@@ -70,11 +70,8 @@ struct CanonUpgrade {
     #[prop(set = Self::set_mode)]
     pub mode: u8,
 
-    #[export(node_path = ["GPUParticles3D"])]
-    #[prop(set = Self::set_water_jet_path)]
-    pub water_jet_path: NodePath,
-
-    water_jet: Option<Gd<GpuParticles3D>>,
+    #[export]
+    pub water_jet: Option<Gd<GpuParticles3D>>,
 
     base: Gd<Node3D>,
 }
@@ -82,29 +79,9 @@ struct CanonUpgrade {
 #[godot_script_impl]
 impl CanonUpgrade {
     pub fn _ready(&mut self) {
-        self.water_jet = self.base.try_get_node_as(self.water_jet_path.clone());
-
-        if self.water_jet.is_none() {
-            logger::error!("Failed to resolve node path: {}", self.water_jet_path);
-        }
-
         self.set_mode(self.mode);
     }
 
-    pub fn set_water_jet_path(&mut self, value: NodePath) {
-        self.water_jet_path = value.clone();
-
-        if !self.base.is_node_ready() {
-            return;
-        }
-
-        self.water_jet = self.base.try_get_node_as(value.clone());
-
-        if self.water_jet.is_none() {
-            logger::error!("Failed to resolve node path: {}", value);
-        }
-    }
-
     pub fn set_mode(&mut self, value: u8) {
         self.mode = value;
 
diff --git a/native/src/scripts/objects/debugger_3_d.rs b/native/src/scripts/objects/debugger_3_d.rs
index b769416..1ef7e0e 100644
--- a/native/src/scripts/objects/debugger_3_d.rs
+++ b/native/src/scripts/objects/debugger_3_d.rs
@@ -1,5 +1,5 @@
 use godot::{
-	builtin::{Dictionary, GString, NodePath},
+	builtin::{Dictionary, GString},
 	engine::{Node3D, RichTextLabel},
 	obj::Gd,
 };
@@ -14,22 +14,14 @@ struct Debugger3D {
 	#[export]
 	pub title: GString,
 
-	#[export(node_path = ["RichTextLabel"])]
-	pub text_view_path: NodePath,
+	#[export]
+	pub text_view: Option<Gd<RichTextLabel>>,
 
 	pub debug_data: Dictionary,
-
-	text_view: Option<Gd<RichTextLabel>>,
-
-	base: Gd<Node3D>,
 }
 
 #[godot_script_impl]
 impl Debugger3D {
-	pub fn _ready(&mut self) {
-		self.text_view = self.base.try_get_node_as(self.text_view_path.clone());
-	}
-
 	pub fn _process(&mut self, _delta: f64) {
 		let title = &self.title;
 
diff --git a/native/src/scripts/objects/water_jet.rs b/native/src/scripts/objects/water_jet.rs
index 6fc0333..e9ac0bf 100644
--- a/native/src/scripts/objects/water_jet.rs
+++ b/native/src/scripts/objects/water_jet.rs
@@ -1,9 +1,7 @@
 use std::{cmp::Ordering, ops::DerefMut};
 
 use anyhow::{bail, Result};
-use godot::builtin::{
-    Array, Callable, Dictionary, GString, NodePath, StringName, Variant, Vector3,
-};
+use godot::builtin::{Array, Callable, Dictionary, GString, StringName, Variant, Vector3};
 use godot::engine::object::ConnectFlags;
 use godot::engine::{
     Area3D, Decal, GpuParticles3D, Node, Node3D, Object, PhysicsRayQueryParameters3D,
@@ -13,7 +11,7 @@ use godot::global::{clampf, deg_to_rad, randf_range};
 use godot::meta::ToGodot;
 use godot::obj::bounds::Declarer;
 use godot::obj::{Bounds, EngineEnum, Gd, Inherits, InstanceId};
-use godot::prelude::GodotClass;
+use godot::prelude::{GodotClass, NodePath};
 use godot_rust_script::{godot_script_impl, GodotScript};
 use itertools::Itertools;
 
@@ -26,25 +24,20 @@ use crate::{
 #[derive(GodotScript, Debug)]
 #[script(base = GpuParticles3D)]
 struct WaterJet {
-    #[export(node_path = ["Array[ShapeCast]"])]
-    pub impact_casts_path: Array<NodePath>,
+    /// List of ShapeCast3D nodes to aproximate particle impact.
+    #[export(node_path = ["ShapeCast3D"])]
+    pub impact_cast_paths: Array<NodePath>,
 
     impact_casts: Vec<Gd<ShapeCast3D>>,
 
-    #[export(node_path = ["Area3D"])]
-    pub impact_area_path: NodePath,
-
-    impact_area: Option<Gd<Area3D>>,
-
-    #[export(node_path = ["Decal"])]
-    pub decal_path: NodePath,
+    #[export]
+    pub impact_area: Option<Gd<Area3D>>,
 
-    decal: Option<Gd<Decal>>,
+    #[export]
+    pub decal: Option<Gd<Decal>>,
 
-    #[export(node_path = ["Debugger3D"])]
-    pub debugger_path: NodePath,
-
-    debugger: Option<Gd<Node3D>>,
+    #[export]
+    pub debugger: Option<Gd<Node3D>>,
 
     /// Maximum number of decals that will be spawned at an impact point.
     #[export(range(min = 1.0, max = 255.0, step = 1.0))]
@@ -66,6 +59,14 @@ struct Intersection {
 impl WaterJet {
     const MAX_DISTANCE: f64 = 60.0;
 
+    pub fn _ready(&mut self) {
+        self.impact_casts = self
+            .impact_cast_paths
+            .iter_shared()
+            .map(|path| self.base.get_node_as(path))
+            .collect();
+    }
+
     fn impact_area(&self) -> &Gd<Area3D> {
         let Some(impact_area) = self.impact_area.as_ref() else {
             panic!("Missing impact area!");
@@ -147,18 +148,6 @@ impl WaterJet {
         }))
     }
 
-    pub fn _ready(&mut self) {
-        self.impact_casts = self
-            .impact_casts_path
-            .iter_shared()
-            .map(|path| self.base.get_node_as(path))
-            .collect();
-
-        self.impact_area = self.base.try_get_node_as(self.impact_area_path.clone());
-        self.decal = self.base.try_get_node_as(self.decal_path.clone());
-        self.debugger = self.base.try_get_node_as(self.debugger_path.clone());
-    }
-
     pub fn _physics_process(&mut self, delta: f64) {
         let mut debugger = self
             .debugger
diff --git a/native/src/scripts/spawner/fire_spawner.rs b/native/src/scripts/spawner/fire_spawner.rs
index 531abb9..5a3ad70 100644
--- a/native/src/scripts/spawner/fire_spawner.rs
+++ b/native/src/scripts/spawner/fire_spawner.rs
@@ -1,5 +1,5 @@
 use godot::builtin::math::ApproxEq;
-use godot::builtin::{NodePath, Transform3D, Vector3, Vector3Axis};
+use godot::builtin::{Transform3D, Vector3, Vector3Axis};
 use godot::classes::{light_3d, FogVolume, Node, OmniLight3D, ShaderMaterial};
 use godot::meta::ToGodot;
 use godot::obj::Gd;
@@ -11,25 +11,20 @@ use crate::util::logger;
 #[script(base = Node)]
 pub struct FireSpawner {
     /// Node path to the fog volume for the flames.
-    #[export(node_path = ["FogVolume"])]
-    pub fire_path: NodePath,
-    fire: Option<Gd<FogVolume>>,
+    #[export]
+    pub fire: Option<Gd<FogVolume>>,
 
     /// Node path to the fog volume for the smoke.
-    #[export(node_path = ["FogVolume"])]
-    pub smoke_path: NodePath,
-    smoke: Option<Gd<FogVolume>>,
+    #[export]
+    pub smoke: Option<Gd<FogVolume>>,
 
     /// Node path to the omni light source of the fire.
-    #[export(node_path = ["OmniLight3D"])]
-    pub light_source_path: NodePath,
-    light_source: Option<Gd<OmniLight3D>>,
+    #[export]
+    pub light_source: Option<Gd<OmniLight3D>>,
 
     default_light_energy: f32,
 
     strength: f64,
-
-    base: Gd<Node>,
 }
 
 #[godot_script_impl]
@@ -40,9 +35,6 @@ impl FireSpawner {
 
     pub fn _ready(&mut self) {
         logger::debug!("Init Fire spawner...");
-        self.fire = self.base.try_get_node_as(self.fire_path.clone());
-        self.smoke = self.base.try_get_node_as(self.smoke_path.clone());
-        self.light_source = self.base.try_get_node_as(self.light_source_path.clone());
 
         if let Some(ref mut fire) = self.fire {
             if let Some(material) = fire.get_material() {
diff --git a/native/src/scripts/world/solar_setup.rs b/native/src/scripts/world/solar_setup.rs
index c748fa4..4d600d7 100644
--- a/native/src/scripts/world/solar_setup.rs
+++ b/native/src/scripts/world/solar_setup.rs
@@ -1,4 +1,4 @@
-use godot::builtin::{NodePath, Vector3};
+use godot::builtin::Vector3;
 use godot::engine::{light_3d, DirectionalLight3D, Node3D, Time};
 use godot::obj::Gd;
 use godot_rust_script::{godot_script_impl, GodotScript};
@@ -9,14 +9,12 @@ use crate::util::logger;
 #[script(base = Node3D)]
 struct SolarSetup {
     /// Reference to the sun child node.
-    #[export(node_path = ["DirectionalLight3D"])]
-    pub sun: NodePath,
-
-    sun_ref: Option<Gd<DirectionalLight3D>>,
+    #[export]
+    pub sun: Option<Gd<DirectionalLight3D>>,
 
     /// Reference to the moon child node.
-    #[export(node_path = ["DirectionalLight3D"])]
-    pub moon: NodePath,
+    #[export]
+    pub moon: Option<Gd<DirectionalLight3D>>,
 
     // duration from sun rise to sun set in minutes
     #[export(range(min = 1.0, max = 120.0, step = 1.0))]
@@ -27,21 +25,13 @@ struct SolarSetup {
 
 #[godot_script_impl]
 impl SolarSetup {
-    fn sun(&mut self) -> Option<Gd<DirectionalLight3D>> {
-        if self.sun_ref.is_none() {
-            self.sun_ref = self.base.try_get_node_as(self.sun.clone());
-        }
-
-        self.sun_ref.clone()
-    }
-
     pub fn _physics_process(&mut self, _delta: f64) {
         let day_length = self.day_length * 60 * 1000;
         let time = Time::singleton().get_ticks_msec() % (day_length * 2);
 
         let sun_pos = time as f32 * (360.0 / (day_length * 2) as f32);
 
-        let Some(mut sun) = self.sun() else {
+        let Some(ref mut sun) = self.sun else {
             logger::error!("no sun is assigned to solar setup!");
             logger::error!("node path: {}", self.base.get_path());
 
diff --git a/resources/Objects/Buildings/condominiums_medium_2.tscn b/resources/Objects/Buildings/condominiums_medium_2.tscn
index 27ccfcc..0ca89fa 100644
--- a/resources/Objects/Buildings/condominiums_medium_2.tscn
+++ b/resources/Objects/Buildings/condominiums_medium_2.tscn
@@ -6,10 +6,10 @@
 [sub_resource type="ConcavePolygonShape3D" id="1"]
 data = PackedVector3Array(9.555, -10.585, -19.2257, 9.555, 10.085, -19.7743, 9.555, -10.585, -19.7743, 9.555, -10.585, -19.2257, 9.555, 10.085, -19.2257, 9.555, 10.085, -19.7743, -3.0961, 7.2485, -19.7743, -3.0961, 10.085, -19.2257, -3.0961, 10.085, -19.7743, -3.0961, 7.2485, -19.7743, -3.0961, 7.2485, -19.2257, -3.0961, 10.085, -19.2257, 9.0153, -10, -19.7743, 9, 9.5, -23, 9.0153, -10, -23, 9.0153, -10, -19.7743, 9, 9.5, -19.7743, 9, 9.5, -23, -3.6812, 9.5, -19.7743, -3.6812, 6.3529, -23, -3.6812, 6.3529, -19.7743, -3.6812, 9.5, -19.7743, -3.6812, 9.5, -23, -3.6812, 6.3529, -23, -10.055, -10.585, -19.7743, -10.055, 10.085, -19.2257, -10.055, -10.585, -19.2257, -10.055, -10.585, -19.7743, -10.055, 10.085, -19.7743, -10.055, 10.085, -19.2257, 2.9207, 7.2485, -19.2257, 2.9207, 10.085, -19.7743, 2.9207, 10.085, -19.2257, 2.9207, 7.2485, -19.2257, 2.9207, 7.2485, -19.7743, 2.9207, 10.085, -19.7743, -9.5, -10, -23, -9.5, 9.5, -19.7743, -9.5, -10, -19.7743, -9.5, -10, -23, -9.5, 9.5, -23, -9.5, 9.5, -19.7743, 3.4875, 9.5, -23, 3.4875, 6.3529, -19.7743, 3.4875, 6.3529, -23, 3.4875, 9.5, -23, 3.4875, 9.5, -19.7743, 3.4875, 6.3529, -19.7743, 3.4875, 9.5, -19.2257, 3.4875, 6.3529, 0, 3.4875, 6.3529, -19.2257, 3.4875, 9.5, -19.2257, 3.4875, 9.5, 0, 3.4875, 6.3529, 0, -9.5, -10, -19.2257, -9.5, 9.5, 0, -9.5, -10, 0, -9.5, -10, -19.2257, -9.5, 9.5, -19.2257, -9.5, 9.5, 0, -3.6812, 6.3529, -19.2257, -3.6812, 9.5, 0, -3.6812, 9.5, -19.2257, -3.6812, 6.3529, -19.2257, -3.6812, 6.3529, 0, -3.6812, 9.5, 0, 9.0153, -10, 0, 9, 9.5, -19.2257, 9.0153, -10, -19.2258, 9.0153, -10, 0, 9, 9.5, 0, 9, 9.5, -19.2257, 9.555, 10.085, -19.2257, 9.0153, -10, -19.2258, 9, 9.5, -19.2257, 9.555, 10.085, -19.2257, 9.555, -10.585, -19.2257, 9.0153, -10, -19.2258, 2.9207, 10.085, -19.2257, 9, 9.5, -19.2257, 3.4875, 9.5, -19.2257, 2.9207, 10.085, -19.2257, 9.555, 10.085, -19.2257, 9, 9.5, -19.2257, 2.9207, 7.2485, -19.2257, 3.4875, 9.5, -19.2257, 3.4875, 6.3529, -19.2257, 2.9207, 7.2485, -19.2257, 2.9207, 10.085, -19.2257, 3.4875, 9.5, -19.2257, -10.055, -10.585, -19.2257, -9.5, 9.5, -19.2257, -9.5, -10, -19.2257, -10.055, -10.585, -19.2257, -10.055, 10.085, -19.2257, -9.5, 9.5, -19.2257, -3.0961, 10.085, -19.2257, -3.6812, 6.3529, -19.2257, -3.6812, 9.5, -19.2257, -3.0961, 10.085, -19.2257, -3.0961, 7.2485, -19.2257, -3.6812, 6.3529, -19.2257, 9.555, -10.585, -19.2257, -9.5, -10, -19.2257, 9.0153, -10, -19.2258, 9.555, -10.585, -19.2257, -10.055, -10.585, -19.2257, -9.5, -10, -19.2257, -3.6812, 6.3529, -19.2257, 2.9207, 7.2485, -19.2257, 3.4875, 6.3529, -19.2257, -3.6812, 6.3529, -19.2257, -3.0961, 7.2485, -19.2257, 2.9207, 7.2485, -19.2257, -10.055, 10.085, -19.2257, -3.6812, 9.5, -19.2257, -9.5, 9.5, -19.2257, -10.055, 10.085, -19.2257, -3.0961, 10.085, -19.2257, -3.6812, 9.5, -19.2257, 9.555, 10.085, -19.7743, 2.9207, 10.085, -19.2257, 2.9207, 10.085, -19.7743, 9.555, 10.085, -19.7743, 9.555, 10.085, -19.2257, 2.9207, 10.085, -19.2257, -3.0961, 10.085, -19.2257, -10.055, 10.085, -19.7743, -3.0961, 10.085, -19.7743, -3.0961, 10.085, -19.2257, -10.055, 10.085, -19.2257, -10.055, 10.085, -19.7743, 2.9207, 7.2485, -19.7743, -3.0961, 7.2485, -19.2257, -3.0961, 7.2485, -19.7743, 2.9207, 7.2485, -19.7743, 2.9207, 7.2485, -19.2257, -3.0961, 7.2485, -19.2257, -3.6812, 9.5, -23, -9.5, 9.5, -19.7743, -9.5, 9.5, -23, -3.6812, 9.5, -23, -3.6812, 9.5, -19.7743, -9.5, 9.5, -19.7743, 9, 9.5, -23, 3.4875, 9.5, -19.7743, 3.4875, 9.5, -23, 9, 9.5, -23, 9, 9.5, -19.7743, 3.4875, 9.5, -19.7743, 3.4875, 6.3529, -23, -3.6812, 6.3529, -19.7743, -3.6812, 6.3529, -23, 3.4875, 6.3529, -23, 3.4875, 6.3529, -19.7743, -3.6812, 6.3529, -19.7743, -10.055, 10.085, -19.7743, -9.5, -10, -19.7743, -9.5, 9.5, -19.7743, -10.055, 10.085, -19.7743, -10.055, -10.585, -19.7743, -9.5, -10, -19.7743, -3.0961, 10.085, -19.7743, -9.5, 9.5, -19.7743, -3.6812, 9.5, -19.7743, -3.0961, 10.085, -19.7743, -10.055, 10.085, -19.7743, -9.5, 9.5, -19.7743, -3.0961, 10.085, -19.7743, -3.6812, 6.3529, -19.7743, -3.0961, 7.2485, -19.7743, -3.0961, 10.085, -19.7743, -3.6812, 9.5, -19.7743, -3.6812, 6.3529, -19.7743, 9.555, -10.585, -19.7743, 9, 9.5, -19.7743, 9.0153, -10, -19.7743, 9.555, -10.585, -19.7743, 9.555, 10.085, -19.7743, 9, 9.5, -19.7743, 3.4875, 6.3529, -19.7743, 2.9207, 10.085, -19.7743, 2.9207, 7.2485, -19.7743, 3.4875, 6.3529, -19.7743, 3.4875, 9.5, -19.7743, 2.9207, 10.085, -19.7743, -10.055, -10.585, -19.7743, 9.0153, -10, -19.7743, -9.5, -10, -19.7743, -10.055, -10.585, -19.7743, 9.555, -10.585, -19.7743, 9.0153, -10, -19.7743, 3.4875, 6.3529, -19.7743, -3.0961, 7.2485, -19.7743, -3.6812, 6.3529, -19.7743, 3.4875, 6.3529, -19.7743, 2.9207, 7.2485, -19.7743, -3.0961, 7.2485, -19.7743, 9.555, 10.085, -19.7743, 3.4875, 9.5, -19.7743, 9, 9.5, -19.7743, 9.555, 10.085, -19.7743, 2.9207, 10.085, -19.7743, 3.4875, 9.5, -19.7743, -3.6812, 9.5, -23, -9.5, -10, -23, -3.6812, 6.3529, -23, -3.6812, 9.5, -23, -9.5, 9.5, -23, -9.5, -10, -23, 9.0153, -10, -23, 3.4875, 9.5, -23, 3.4875, 6.3529, -23, 9.0153, -10, -23, 9, 9.5, -23, 3.4875, 9.5, -23, -9.5, -10, -23, 3.4875, 6.3529, -23, -3.6812, 6.3529, -23, -9.5, -10, -23, 9.0153, -10, -23, 3.4875, 6.3529, -23, -10.055, -10.585, -19.7743, 9.555, -10.585, -19.2257, 9.555, -10.585, -19.7743, -10.055, -10.585, -19.7743, -10.055, -10.585, -19.2257, 9.555, -10.585, -19.2257, 9.0153, -10, -23, -9.5, -10, -19.7743, 9.0153, -10, -19.7743, 9.0153, -10, -23, -9.5, -10, -23, -9.5, -10, -19.7743, 3.4875, 9.5, 0, 9, 9.5, -19.2257, 9, 9.5, 0, 3.4875, 9.5, 0, 3.4875, 9.5, -19.2257, 9, 9.5, -19.2257, 3.4875, 6.3529, -19.2257, -3.6812, 6.3529, 0, -3.6812, 6.3529, -19.2257, 3.4875, 6.3529, -19.2257, 3.4875, 6.3529, 0, -3.6812, 6.3529, 0, -9.5, 9.5, 0, -3.6812, 9.5, -19.2257, -3.6812, 9.5, 0, -9.5, 9.5, 0, -9.5, 9.5, -19.2257, -3.6812, 9.5, -19.2257, 9.0153, -10, 0, -9.5, -10, -19.2257, -9.5, -10, 0, 9.0153, -10, 0, 9.0153, -10, -19.2258, -9.5, -10, -19.2257)
 
-[node name="CondominiumsMedium2" instance=ExtResource("1")]
+[node name="CondominiumsMedium2" node_paths=PackedStringArray("mesh") instance=ExtResource("1")]
 script = ExtResource("2_gr7u5")
 events = 1
-mesh_path = NodePath("Maxis-3d3-mesh-33")
+mesh = NodePath("Maxis-3d3-mesh-33")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="." index="1"]
 transform = Transform3D(1, 0, 0, 0, -1.19209e-07, -1, 0, 1, -1.19209e-07, 0, 0, 0)
diff --git a/resources/Objects/Buildings/home_middle_class_3.tscn b/resources/Objects/Buildings/home_middle_class_3.tscn
index acebbb5..4f5b71c 100644
--- a/resources/Objects/Buildings/home_middle_class_3.tscn
+++ b/resources/Objects/Buildings/home_middle_class_3.tscn
@@ -6,10 +6,10 @@
 [sub_resource type="ConcavePolygonShape3D" id="1"]
 data = PackedVector3Array(-7.4048, -0.1789, 0.0228, 7.2402, -0.1786, -4.8684, 7.2402, -0.1786, 0.0228, -7.4048, -0.1789, 0.0228, -7.4048, -0.1789, -4.8684, 7.2402, -0.1786, -4.8684, -7.4594, 7.2653, 0.0228, -0.4521, 7.2653, -4.8684, -0.4521, 7.2653, 0.0228, -7.4594, 7.2653, 0.0228, -7.4594, 7.2653, -4.8684, -0.4521, 7.2653, -4.8684, -7.4042, -7.0032, -4.8684, 7.2408, -7.0032, 0.0228, 7.2408, -7.0032, -4.8684, -7.4042, -7.0032, -4.8684, -7.4042, -7.0032, 0.0228, 7.2408, -7.0032, 0.0228, -7.4594, 0.4408, -4.8684, -0.4521, 0.4408, 0.0228, -0.4521, 0.4408, -4.8684, -7.4594, 0.4408, -4.8684, -7.4594, 0.4408, 0.0228, -0.4521, 0.4408, 0.0228, -7.4042, -7.0032, 0.0228, -7.4048, -0.1789, -4.8684, -7.4048, -0.1789, 0.0228, -7.4042, -7.0032, 0.0228, -7.4042, -7.0032, -4.8684, -7.4048, -0.1789, -4.8684, -7.4594, 0.4408, 0.0228, -7.4594, 7.2653, -4.8684, -7.4594, 7.2653, 0.0228, -7.4594, 0.4408, 0.0228, -7.4594, 0.4408, -4.8684, -7.4594, 7.2653, -4.8684, 7.2408, -7.0032, 0.0228, 7.2402, -0.1786, -4.8684, 7.2408, -7.0032, -4.8684, 7.2408, -7.0032, 0.0228, 7.2402, -0.1786, 0.0228, 7.2402, -0.1786, -4.8684, -0.4521, 0.4408, 0.0228, -0.4521, 7.2653, -4.8684, -0.4521, 0.4408, -4.8684, -0.4521, 0.4408, 0.0228, -0.4521, 7.2653, 0.0228, -0.4521, 7.2653, -4.8684, -7.4048, -0.1789, -4.8684, -7.4042, -7.0032, -4.8684, -7.4045, -3.6063, -6.8183, -7.4594, 7.2653, -4.8684, -7.4594, 0.4408, -4.8684, -7.4594, 3.8531, -6.8183, 7.2402, -0.1786, -4.8684, 7.2405, -3.6235, -6.8183, 7.2408, -7.0032, -4.8684, -0.4521, 7.2653, -4.8684, -0.4521, 3.8531, -6.8183, -0.4521, 0.4408, -4.8684, -7.4045, -3.6063, -6.8183, -7.4042, -7.0032, -4.8684, 7.2405, -3.6235, -6.8183, 7.2405, -3.6235, -6.8183, -7.4042, -7.0032, -4.8684, 7.2408, -7.0032, -4.8684, -7.4594, 3.8531, -6.8183, -0.4521, 0.4408, -4.8684, -0.4521, 3.8531, -6.8183, -7.4594, 3.8531, -6.8183, -7.4594, 0.4408, -4.8684, -0.4521, 0.4408, -4.8684, -7.4048, -0.1789, -4.8684, -7.4045, -3.6063, -6.8183, 7.2402, -0.1786, -4.8684, 7.2402, -0.1786, -4.8684, -7.4045, -3.6063, -6.8183, 7.2405, -3.6235, -6.8183, -7.4594, 7.2653, -4.8684, -0.4521, 3.8531, -6.8183, -0.4521, 7.2653, -4.8684, -7.4594, 7.2653, -4.8684, -7.4594, 3.8531, -6.8183, -0.4521, 3.8531, -6.8183)
 
-[node name="HomeMiddleClass3" instance=ExtResource("1")]
+[node name="HomeMiddleClass3" node_paths=PackedStringArray("mesh") instance=ExtResource("1")]
 script = ExtResource("2_dq8cm")
 events = 1
-mesh_path = NodePath("Maxis-3d3-mesh-14")
+mesh = NodePath("Maxis-3d3-mesh-14")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="." index="1"]
 transform = Transform3D(1, 0, 0, 0, -1.19209e-07, -1, 0, 1, -1.19209e-07, 0, 0, 0)
diff --git a/resources/Objects/Buildings/office_building_medium_4.tscn b/resources/Objects/Buildings/office_building_medium_4.tscn
index 13b575a..ada47fa 100644
--- a/resources/Objects/Buildings/office_building_medium_4.tscn
+++ b/resources/Objects/Buildings/office_building_medium_4.tscn
@@ -6,10 +6,10 @@
 [sub_resource type="ConcavePolygonShape3D" id="1"]
 data = PackedVector3Array(-5.9282, -8.5068, -52.6606, -5.9955, -8.5741, -52.6606, -5.9282, -8.5741, -52.6606, -5.9282, -8.5068, -52.6606, -5.9955, -8.5068, -52.6606, -5.9955, -8.5741, -52.6606, -6.0444, -8.4579, -48.7429, -5.9282, -8.5068, -52.6606, -5.8792, -8.4579, -48.7429, -6.0444, -8.4579, -48.7429, -5.9955, -8.5068, -52.6606, -5.9282, -8.5068, -52.6606, -5.9955, -8.5068, -52.6606, -6.0444, -8.623, -48.7429, -5.9955, -8.5741, -52.6606, -5.9955, -8.5068, -52.6606, -6.0444, -8.4579, -48.7429, -6.0444, -8.623, -48.7429, -5.9282, -8.5741, -52.6606, -5.8792, -8.4579, -48.7429, -5.9282, -8.5068, -52.6606, -5.9282, -8.5741, -52.6606, -5.8792, -8.623, -48.7429, -5.8792, -8.4579, -48.7429, -5.9955, -8.5741, -52.6606, -5.8792, -8.623, -48.7429, -5.9282, -8.5741, -52.6606, -5.9955, -8.5741, -52.6606, -6.0444, -8.623, -48.7429, -5.8792, -8.623, -48.7429, 3.0146, 0.5024, -48.7429, -5.8792, -8.4579, -48.7429, 3.0146, -9.0439, -48.7429, 3.0146, 0.5024, -48.7429, -6.5317, 0.5024, -48.7429, -5.8792, -8.4579, -48.7429, -6.5317, 0.5024, -48.7429, -6.0444, -8.623, -48.7429, -6.0444, -8.4579, -48.7429, -6.5317, 0.5024, -48.7429, -6.5317, -9.0439, -48.7429, -6.0444, -8.623, -48.7429, -5.8792, -8.4579, -48.7429, -6.5317, 0.5024, -48.7429, -6.0444, -8.4579, -48.7429, 3.0146, -9.0439, -48.7429, -5.8792, -8.4579, -48.7429, -5.8792, -8.623, -48.7429, -6.5317, -9.0439, -48.7429, -5.8792, -8.623, -48.7429, -6.0444, -8.623, -48.7429, -6.5317, -9.0439, -48.7429, 3.0146, -9.0439, -48.7429, -5.8792, -8.623, -48.7429, -4.2087, 2.3954, -5.5268, -8.5231, 2.3935, -6.2023, -4.1785, 2.3935, -6.2023, -4.2087, 2.3954, -5.5268, -8.5533, 2.3954, -5.5268, -8.5231, 2.3935, -6.2023, -8.4929, -14.5531, -6.2023, -14.0685, -14.5415, -5.4966, -14.0383, -14.5531, -6.2023, -8.4929, -14.5531, -6.2023, -8.5231, -14.5415, -5.4966, -14.0685, -14.5415, -5.4966, -4.2087, 14.6449, -5.5268, -14.0685, 14.6379, -6.2023, -14.0987, 14.6449, -5.5268, -4.2087, 14.6449, -5.5268, -4.1785, 14.6379, -6.2023, -14.0685, 14.6379, -6.2023, -8.5231, 2.3935, -6.2023, -8.5533, 2.3954, -5.5268, -8.5231, -14.5415, -5.4966, -14.0685, -14.5415, -5.4966, -14.0987, 14.6449, -5.5268, -14.0383, -14.5531, -6.2023, -8.5231, -14.5415, -5.4966, -8.4929, -14.5531, -6.2023, -8.5231, 2.3935, -6.2023, -4.1785, 14.6379, -6.2023, -4.2087, 2.3954, -5.5268, -4.1785, 2.3935, -6.2023, -4.1785, 14.6379, -6.2023, -4.2087, 14.6449, -5.5268, -4.2087, 2.3954, -5.5268, -14.0383, -14.5531, -6.2023, -14.0987, 14.6449, -5.5268, -14.0685, 14.6379, -6.2023, 10.5813, 2.0866, -6.2023, 14.6191, 1.5083, -6.2023, 15.0752, 2.0302, -6.2023, 14.6191, 1.5083, -6.2023, 15.0752, -14.9779, -6.2023, 15.0752, 2.0302, -6.2023, -7.4396, -14.5165, -6.2023, 15.0752, -14.9779, -6.2023, 14.614, -14.5165, -6.2023, 15.0752, -14.9779, -6.2023, -8.4929, -14.5531, -6.2023, -15.0246, -14.9779, -6.2023, 15.0752, -14.9779, -6.2023, -7.4396, -14.5165, -6.2023, -8.4929, -14.5531, -6.2023, 10.5813, 2.0866, -6.2023, 10.5813, 15.1127, -6.2023, 10.0789, 14.6008, -6.2023, -4.1785, 14.6379, -6.2023, 10.0789, 14.6008, -6.2023, 10.5813, 15.1127, -6.2023, -4.1785, 14.6379, -6.2023, -3.4869, 14.6008, -6.2023, 10.0789, 14.6008, -6.2023, 10.0487, 1.5073, -29.1413, -3.517, 14.5706, -29.1413, -3.517, 1.5073, -29.1413, 10.0487, 1.5073, -29.1413, 10.0487, 14.5706, -29.1413, -3.517, 14.5706, -29.1413, 14.5706, 1.5073, -30.1462, 4.0195, 0.5024, -30.1462, 13.5658, 0.5024, -30.1462, 3.0146, 0.5024, -30.1462, -7.5365, 1.5073, -30.1462, -6.5317, 0.5024, -30.1462, 14.5706, 1.5073, -30.1462, 3.0146, 0.5024, -30.1462, 4.0195, 0.5024, -30.1462, 3.0146, 0.5024, -30.1462, 14.5706, 1.5073, -30.1462, -7.5365, 1.5073, -30.1462, -6.5317, 0.5024, -30.1462, -7.5365, 1.5073, -30.1462, -6.5317, -9.0439, -30.1462, -6.5317, -9.0439, -30.1462, -7.4881, -14.5467, -30.0977, 3.0146, -9.0439, -30.1462, -7.4881, -14.5467, -30.0977, -6.5317, -9.0439, -30.1462, -7.5365, 1.5073, -30.1462, 14.5454, -14.5467, -30.0977, 14.5706, 1.5073, -30.1462, 13.5658, 0.5024, -30.1462, 13.5658, -13.0633, -30.1461, 14.5454, -14.5467, -30.0977, 13.5658, 0.5024, -30.1462, -7.4881, -14.5467, -30.0977, 13.5658, -13.0633, -30.1461, 4.0195, -13.0633, -30.1461, -7.4881, -14.5467, -30.0977, 14.5454, -14.5467, -30.0977, 13.5658, -13.0633, -30.1461, 4.0195, 0.5024, -30.1462, 3.0146, -9.0439, -30.1462, 4.0195, -13.0633, -30.1461, 4.0195, 0.5024, -30.1462, 3.0146, 0.5024, -30.1462, 3.0146, -9.0439, -30.1462, 4.0195, -13.0633, -30.1461, 3.0146, -9.0439, -30.1462, -7.4881, -14.5467, -30.0977, 13.5658, 0.5024, -38.6876, 4.0195, -13.0633, -38.6876, 13.5658, -13.0633, -38.6876, 13.5658, 0.5024, -38.6876, 4.0195, 0.5024, -38.6876, 4.0195, -13.0633, -38.6876, -8.5231, 2.3935, -6.2023, -3.4869, 1.49, -6.2023, -4.1785, 2.3935, -6.2023, -8.5231, 2.3935, -6.2023, -7.5064, 1.49, -6.2023, -3.4869, 1.49, -6.2023, -7.5064, 1.49, -6.2023, -8.4929, -14.5531, -6.2023, -7.4396, -14.5165, -6.2023, -7.5064, 1.49, -6.2023, -8.5231, 2.3935, -6.2023, -8.4929, -14.5531, -6.2023, -14.0685, 14.6379, -6.2023, -15.0246, -14.9779, -6.2023, -14.0383, -14.5531, -6.2023, -14.0685, 14.6379, -6.2023, -15.0429, 15.1127, -6.2023, -15.0246, -14.9779, -6.2023, -8.4929, -14.5531, -6.2023, -14.0383, -14.5531, -6.2023, -15.0246, -14.9779, -6.2023, 10.5813, 15.1127, -6.2023, -14.0685, 14.6379, -6.2023, -4.1785, 14.6379, -6.2023, 10.5813, 15.1127, -6.2023, -15.0429, 15.1127, -6.2023, -14.0685, 14.6379, -6.2023, -3.4869, 14.6008, -6.2023, -4.1785, 2.3935, -6.2023, -3.4869, 1.49, -6.2023, -3.4869, 14.6008, -6.2023, -4.1785, 14.6379, -6.2023, -4.1785, 2.3935, -6.2023, -14.0987, 14.6449, -5.5268, -14.0685, -14.5415, -5.4966, -8.5231, -14.5415, -5.4966, -14.0987, 14.6449, -5.5268, -8.5231, -14.5415, -5.4966, -8.5533, 2.3954, -5.5268, -4.2087, 14.6449, -5.5268, -8.5533, 2.3954, -5.5268, -4.2087, 2.3954, -5.5268, -4.2087, 14.6449, -5.5268, -14.0987, 14.6449, -5.5268, -8.5533, 2.3954, -5.5268, -7.5365, 1.5073, -30.1462, -7.5064, 1.49, -6.2023, -7.4881, -14.5467, -30.0977, -7.4881, -14.5467, -30.0977, -7.5064, 1.49, -6.2023, -7.4396, -14.5165, -6.2023, 4.0195, 0.5024, -38.6876, 4.0195, -13.0633, -30.1461, 4.0195, -13.0633, -38.6876, 4.0195, 0.5024, -38.6876, 4.0195, 0.5024, -30.1462, 4.0195, -13.0633, -30.1461, -6.5317, 0.5024, -48.7429, -6.5317, -9.0439, -30.1462, -6.5317, -9.0439, -48.7429, -6.5317, 0.5024, -48.7429, -6.5317, 0.5024, -30.1462, -6.5317, -9.0439, -30.1462, -3.4869, 14.6008, -6.2023, -3.517, 1.5073, -29.1413, -3.517, 14.5706, -29.1413, -3.4869, 14.6008, -6.2023, -3.4869, 1.49, -6.2023, -3.517, 1.5073, -29.1413, 14.5706, 1.5073, -30.1462, 14.614, -14.5165, -6.2023, 14.6191, 1.5083, -6.2023, 14.614, -14.5165, -6.2023, 14.5706, 1.5073, -30.1462, 14.5454, -14.5467, -30.0977, 13.5658, 0.5024, -30.1462, 13.5658, -13.0633, -38.6876, 13.5658, -13.0633, -30.1461, 13.5658, 0.5024, -30.1462, 13.5658, 0.5024, -38.6876, 13.5658, -13.0633, -38.6876, 3.0146, 0.5024, -30.1462, 3.0146, -9.0439, -48.7429, 3.0146, -9.0439, -30.1462, 3.0146, 0.5024, -30.1462, 3.0146, 0.5024, -48.7429, 3.0146, -9.0439, -48.7429, 10.0487, 14.5706, -29.1413, 10.0789, 1.49, -6.2023, 10.0789, 14.6008, -6.2023, 10.0487, 14.5706, -29.1413, 10.0487, 1.5073, -29.1413, 10.0789, 1.49, -6.2023, 15.0731, -15.0264, 0, -15.0246, -14.9779, -6.2023, -15.0127, -15.0264, 0, 15.0731, -15.0264, 0, 15.0752, -14.9779, -6.2023, -15.0246, -14.9779, -6.2023, 10.5512, 2.0564, 0, 10.5813, 2.0866, -6.2023, 15.0731, 2.0564, 0, 10.5813, 2.0866, -6.2023, 15.0752, 2.0302, -6.2023, 15.0731, 2.0564, 0, -15.0127, 15.1198, 0, 10.5813, 15.1127, -6.2023, 10.5512, 15.1198, 0, -15.0127, 15.1198, 0, -15.0429, 15.1127, -6.2023, 10.5813, 15.1127, -6.2023, -15.0127, -15.0264, 0, -15.0246, -14.9779, -6.2023, -15.0127, 15.1198, 0, -15.0246, -14.9779, -6.2023, -15.0429, 15.1127, -6.2023, -15.0127, 15.1198, 0, 15.0731, 2.0564, 0, 15.0752, -14.9779, -6.2023, 15.0731, -15.0264, 0, 15.0731, 2.0564, 0, 15.0752, 2.0302, -6.2023, 15.0752, -14.9779, -6.2023, 10.5512, 15.1198, 0, 10.5813, 2.0866, -6.2023, 10.5512, 2.0564, 0, 10.5512, 15.1198, 0, 10.5813, 15.1127, -6.2023, 10.5813, 2.0866, -6.2023, 3.0146, 0.5024, -48.7429, -6.5317, 0.5024, -30.1462, -6.5317, 0.5024, -48.7429, 3.0146, 0.5024, -48.7429, 3.0146, 0.5024, -30.1462, -6.5317, 0.5024, -30.1462, 13.5658, 0.5024, -38.6876, 4.0195, 0.5024, -30.1462, 4.0195, 0.5024, -38.6876, 13.5658, 0.5024, -38.6876, 13.5658, 0.5024, -30.1462, 4.0195, 0.5024, -30.1462, -3.4869, 1.49, -6.2023, -7.5365, 1.5073, -30.1462, -3.517, 1.5073, -29.1413, -3.4869, 1.49, -6.2023, -7.5064, 1.49, -6.2023, -7.5365, 1.5073, -30.1462, 14.6191, 1.5083, -6.2023, 10.0789, 1.49, -6.2023, 14.5706, 1.5073, -30.1462, 14.5706, 1.5073, -30.1462, 10.0789, 1.49, -6.2023, 10.0487, 1.5073, -29.1413, -7.5365, 1.5073, -30.1462, 10.0487, 1.5073, -29.1413, -3.517, 1.5073, -29.1413, -7.5365, 1.5073, -30.1462, 14.5706, 1.5073, -30.1462, 10.0487, 1.5073, -29.1413, 10.0789, 14.6008, -6.2023, -3.517, 14.5706, -29.1413, 10.0487, 14.5706, -29.1413, 10.0789, 14.6008, -6.2023, -3.4869, 14.6008, -6.2023, -3.517, 14.5706, -29.1413, 3.0146, -9.0439, -30.1462, -6.5317, -9.0439, -48.7429, -6.5317, -9.0439, -30.1462, 3.0146, -9.0439, -30.1462, 3.0146, -9.0439, -48.7429, -6.5317, -9.0439, -48.7429, 13.5658, -13.0633, -30.1461, 4.0195, -13.0633, -38.6876, 4.0195, -13.0633, -30.1461, 13.5658, -13.0633, -30.1461, 13.5658, -13.0633, -38.6876, 4.0195, -13.0633, -38.6876, 14.614, -14.5165, -6.2023, -7.4881, -14.5467, -30.0977, -7.4396, -14.5165, -6.2023, 14.614, -14.5165, -6.2023, 14.5454, -14.5467, -30.0977, -7.4881, -14.5467, -30.0977)
 
-[node name="OfficesMedium4" instance=ExtResource("1")]
+[node name="OfficesMedium4" node_paths=PackedStringArray("mesh") instance=ExtResource("1")]
 script = ExtResource("2_67wch")
 events = 1
-mesh_path = NodePath("Maxis-3d1-mesh-44")
+mesh = NodePath("Maxis-3d1-mesh-44")
 
 [node name="CollisionShape3D" type="CollisionShape3D" parent="." index="1"]
 transform = Transform3D(1, 0, 0, 0, -1.19209e-07, -1, 0, 1, -1.19209e-07, 0, 0, 0)
diff --git a/resources/Objects/Helis/Upgrades/canon.tscn b/resources/Objects/Helis/Upgrades/canon.tscn
index 20a90b7..9f8a52c 100644
--- a/resources/Objects/Helis/Upgrades/canon.tscn
+++ b/resources/Objects/Helis/Upgrades/canon.tscn
@@ -45,11 +45,11 @@ radius = 7.0
 [sub_resource type="ViewportTexture" id="ViewportTexture_0mey1"]
 viewport_path = NodePath("WaterJetDebugger/SubViewport")
 
-[node name="Canon" instance=ExtResource("1_54ycj")]
+[node name="Canon" node_paths=PackedStringArray("water_jet") instance=ExtResource("1_54ycj")]
 transform = Transform3D(-1, 3.48787e-16, -8.74228e-08, 3.48787e-16, 1, -3.48787e-16, 8.74228e-08, -3.48787e-16, -1, 0, 0, 0)
 script = ExtResource("2_1jnub")
 mode = 0
-water_jet_path = NodePath("WaterJet")
+water_jet = NodePath("WaterJet")
 
 [node name="Maxis-3d2-mesh-143" parent="." index="0"]
 transform = Transform3D(1, -4.02216e-24, 0, -4.02216e-24, 1, 0, 0, 0, 1, 0, 0, 0)
@@ -62,7 +62,7 @@ shape = SubResource("ConvexPolygonShape3D_tggho")
 transform = Transform3D(1, -4.02216e-24, 0, -4.02216e-24, 1, 0, 0, 0, 1, 0, 0, 0)
 shape = SubResource("ConvexPolygonShape3D_yhox5")
 
-[node name="WaterJet" type="GPUParticles3D" parent="." index="1"]
+[node name="WaterJet" type="GPUParticles3D" parent="." index="1" node_paths=PackedStringArray("impact_area", "decal", "debugger")]
 transform = Transform3D(-1, 3.48787e-16, -8.74228e-08, 3.48787e-16, 1, -3.48787e-16, 8.74228e-08, -3.48787e-16, -1, -5.06016e-15, 0.266152, 2.15765)
 emitting = false
 amount = 2000
@@ -72,10 +72,10 @@ draw_order = 3
 process_material = ExtResource("2_nsqv1")
 draw_pass_1 = SubResource("QuadMesh_wqt7j")
 script = ExtResource("4_3ki7x")
-impact_casts_path = [NodePath("ParticleImpactCastA"), NodePath("ParticleImpactCastB"), NodePath("ParticleImpactCastC"), NodePath("ParticleImpactCastD"), NodePath("ParticleImpactCastE"), NodePath("ParticleImpactCastF")]
-impact_area_path = NodePath("ParticleImpactArea")
-decal_path = NodePath("WaterDecal")
-debugger_path = NodePath("../WaterJetDebugger")
+impact_cast_paths = Array[NodePath]([NodePath("ParticleImpactCastA"), NodePath("ParticleImpactCastB"), NodePath("ParticleImpactCastC"), NodePath("ParticleImpactCastD"), NodePath("ParticleImpactCastE"), NodePath("ParticleImpactCastF")])
+impact_area = NodePath("ParticleImpactArea")
+decal = NodePath("WaterDecal")
+debugger = NodePath("../WaterJetDebugger")
 max_decal_count = 10
 max_delay = 1.8
 
@@ -159,7 +159,7 @@ tree_root = ExtResource("11_sjwuo")
 advance_expression_base_node = NodePath("..")
 anim_player = NodePath("../AudioPlayer")
 
-[node name="WaterJetDebugger" type="Sprite3D" parent="." index="2"]
+[node name="WaterJetDebugger" type="Sprite3D" parent="." index="2" node_paths=PackedStringArray("text_view")]
 process_mode = 4
 transform = Transform3D(1, -4.02216e-24, 0, -4.02216e-24, 1, 0, 0, 0, 1, -2.98064, 1.59321, 1.60687)
 visible = false
@@ -168,7 +168,7 @@ no_depth_test = true
 texture = SubResource("ViewportTexture_0mey1")
 script = ExtResource("10_7u3rm")
 title = "Water Jet Debugger"
-text_view_path = NodePath("SubViewport/WaterJetDebugControl/MarginContainer/RichTextLabel")
+text_view = NodePath("SubViewport/WaterJetDebugControl/MarginContainer/RichTextLabel")
 
 [node name="SubViewport" type="SubViewport" parent="WaterJetDebugger" index="0"]
 disable_3d = true
diff --git a/resources/Objects/Spawner/fire_spawner.tscn b/resources/Objects/Spawner/fire_spawner.tscn
index d03b4ee..f890364 100644
--- a/resources/Objects/Spawner/fire_spawner.tscn
+++ b/resources/Objects/Spawner/fire_spawner.tscn
@@ -6,12 +6,12 @@
 [ext_resource type="AnimationLibrary" uid="uid://dtoyo725l55bb" path="res://resources/Animations/fire_spawner.tres" id="4_rhyet"]
 [ext_resource type="AnimationNodeStateMachine" uid="uid://dfjcsgxlys31s" path="res://resources/Animations/fire_spawner_animation_states.tres" id="5_smqef"]
 
-[node name="FireSpawner" type="Marker3D"]
+[node name="FireSpawner" type="Marker3D" node_paths=PackedStringArray("fire", "smoke", "light_source")]
 gizmo_extents = 3.0
 script = ExtResource("1_aar5t")
-fire_path = NodePath("FireLarge")
-smoke_path = NodePath("SmokeLarge")
-light_source_path = NodePath("FireLightSource")
+fire = NodePath("FireLarge")
+smoke = NodePath("SmokeLarge")
+light_source = NodePath("FireLightSource")
 
 [node name="FireLarge" type="FogVolume" parent="."]
 transform = Transform3D(1, 0, 0, 0, 1, 0, 0, 0, 1, 0, 26.8181, 0)
diff --git a/resources/main.tscn b/resources/main.tscn
index afdf973..0b0125f 100644
--- a/resources/main.tscn
+++ b/resources/main.tscn
@@ -109,7 +109,7 @@ world_constants = ExtResource("15")
 environment = ExtResource("8")
 camera_attributes = SubResource("CameraAttributesPractical_lhcij")
 
-[node name="SolarSetup" type="Node3D" parent="SubViewportContainer/SubViewport/World/Environment"]
+[node name="SolarSetup" type="Node3D" parent="SubViewportContainer/SubViewport/World/Environment" node_paths=PackedStringArray("sun", "moon")]
 transform = Transform3D(1, -3.48787e-16, 3.48787e-16, 3.48787e-16, 1, -3.48787e-16, -3.48787e-16, 3.48787e-16, 1, 0, 0, 0)
 rotation_order = 0
 script = ExtResource("12_88vys")