diff --git a/game/buildings/src/assets/building_asset.rs b/game/buildings/src/assets/building_asset.rs
index e607c08..8c73b59 100644
--- a/game/buildings/src/assets/building_asset.rs
+++ b/game/buildings/src/assets/building_asset.rs
@@ -1,3 +1,4 @@
+use asset_loader::create_asset_loader;
 use bevy::prelude::*;
 use serde::{Deserialize, Serialize};
 use shared::resource::ResourceIdentifier;
@@ -10,9 +11,20 @@ pub struct BuildingAsset {
 	pub description: String,
 	pub footprint: BuildingFootprint,
 	pub prefab_path: String,
-	pub prefab: (),
+	#[serde(skip)]
+	pub prefab: Handle<()>,
 
 	pub cost: Vec<ResourceIdentifier>,
 	pub consumption: Vec<ResourceIdentifier>,
 	pub production: Vec<ResourceIdentifier>,
 }
+
+create_asset_loader!(
+	BuildingAssetPlugin,
+	BuildingAssetLoader,
+	BuildingAsset,
+	BuildingAssetLoadState,
+	&["building.json"],
+	prefab_path -> prefab
+	;?
+);
diff --git a/game/buildings/src/assets/building_database.rs b/game/buildings/src/assets/building_database.rs
index d29bfca..06e349c 100644
--- a/game/buildings/src/assets/building_database.rs
+++ b/game/buildings/src/assets/building_database.rs
@@ -8,7 +8,8 @@ use super::building_asset::BuildingAsset;
 pub struct BuildingDatabase {
 	pub hq: u32,
 	pub buildings_paths: Vec<String>,
-	pub buildings: Vec<BuildingAsset>,
+	#[serde(skip)]
+	pub buildings: Vec<Handle<BuildingAsset>>,
 }
 
 create_asset_loader!(
@@ -16,7 +17,7 @@ create_asset_loader!(
 	BuildingDatabaseLoader,
 	BuildingDatabase,
 	BuildingDatabaseState,
-	&["building.db.json"],;
+	&["buildings.db.json"],;
 	buildings_paths -> buildings
 	?
 );
diff --git a/game/main/assets b/game/main/assets
index 8b2a8d2..3021a03 160000
--- a/game/main/assets
+++ b/game/main/assets
@@ -1 +1 @@
-Subproject commit 8b2a8d2e870546a409a38e1a676254561b607586
+Subproject commit 3021a03b38e372d795cbba1e687b13139af07710