diff --git a/scripts/shared/gamedata.js b/scripts/shared/gamedata.js
index 41952a58..106f9685 100644
--- a/scripts/shared/gamedata.js
+++ b/scripts/shared/gamedata.js
@@ -6251,201 +6251,201 @@ let gameData = {
 			1208856469
 		],
 	},
-	vehicleUpgrades: {
-		[VRR_GAME_GTA_SA]: {   // GTA SA
-			1000: "Pro Spoiler",
-			1001: "Win Spoiler",
-			1002: "Drag Spoiler",
-			1003: "Alpha Spoiler",
-			1004: "Champ Scoop Hood",
-			1005: "Fury Scoop Hood",
-			1006: "Roof Scoop Roof",
-			1007: "Right Sideskirt",
-			1008: "5x Nitro",
-			1009: "2x Nitro",
-			1010: "10x Nitro",
-			1011: "Race Scoop Hood",
-			1012: "Worx Scoop Hood",
-			1013: "Round Fog Lamps",
-			1014: "Champ Spoiler",
-			1015: "Race Spoiler",
-			1016: "Worx Spoiler",
-			1017: "Left Sideskirt",
-			1018: "Upswept Exhaust",
-			1019: "Twin Exhaust",
-			1020: "Large Exhaust",
-			1021: "Medium Exhaust",
-			1022: "Small Exhaust",
-			1023: "Fury Spoiler",
-			1024: "Square Fog Lamps",
-			1025: "Offroad Wheels",
-			1026: "Right Alien Sideskirt",
-			1027: "Left Alien Sideskirt",
-			1028: "Alien Exhaust",
-			1029: "X-Flow Exhaust",
-			1030: "Left X-Flow Sideskirt",
-			1031: "Right X-Flow Sideskirt",
-			1032: "Alien Roof Vent Roof",
-			1033: "X-Flow Roof Vent Roof",
-			1034: "Alien Exhaust",
-			1035: "X-Flow Roof Vent Roof",
-			1036: "Right Alien Sideskirt",
-			1037: "X-Flow Exhaust",
-			1038: "Alien Roof Vent Roof",
-			1039: "Left X-Flow Sideskirt",
-			1040: "Left Alien Sideskirt",
-			1041: "Right X-Flow Sideskirt",
-			1042: "Right Chrome Sideskirt",
-			1043: "Slamin Exhaust",
-			1044: "Chrome Exhaust",
-			1045: "X-Flow Exhaust",
-			1046: "Alien Exhaust",
-			1047: "Right Alien Sideskirt",
-			1048: "Right X-Flow Sideskirt",
-			1049: "Alien Spoiler",
-			1050: "X-Flow Spoiler",
-			1051: "Left Alien Sideskirt",
-			1052: "Left X-Flow Sideskirt",
-			1053: "X-Flow Roof",
-			1054: "Alien Roof",
-			1055: "Alien Roof",
-			1056: "Right Alien Sideskirt",
-			1057: "Right X-Flow Sideskirt",
-			1058: "Alien Spoiler",
-			1059: "X-Flow Exhaust",
-			1060: "X-Flow Spoiler",
-			1061: "X-Flow Roof",
-			1062: "Left Alien Sideskirt",
-			1063: "Left X-Flow Sideskirt",
-			1064: "Alien Exhaust",
-			1065: "Alien Exhaust",
-			1066: "X-Flow Exhaust",
-			1067: "Alien Roof",
-			1068: "X-Flow Roof",
-			1069: "Right Alien Sideskirt",
-			1070: "Right X-Flow Sideskirt",
-			1071: "Left Alien Sideskirt",
-			1072: "Left X-Flow Sideskirt",
-			1073: "Shadow Wheels",
-			1074: "Mega Wheels",
-			1075: "Rimshine Wheels",
-			1076: "Wires Wheels",
-			1077: "Classic Wheels",
-			1078: "Twist Wheels",
-			1079: "Cutter Wheels",
-			1080: "Switch Wheels",
-			1081: "Grove Wheels",
-			1082: "Import Wheels",
-			1083: "Dollar Wheels",
-			1084: "Trance Wheels",
-			1085: "Atomic Wheels",
-			1086: "Stereo Stereo",
-			1087: "Hydraulics Hydraulics",
-			1088: "Alien Roof",
-			1089: "X-Flow Exhaust",
-			1090: "Right Alien Sideskirt",
-			1091: "X-Flow Roof",
-			1092: "Alien Exhaust",
-			1093: "Right X-Flow Sideskirt",
-			1094: "Left Alien Sideskirt",
-			1095: "Right X-Flow Sideskirt",
-			1096: "Ahab Wheels",
-			1097: "Virtual Wheels",
-			1098: "Access Wheels",
-			1099: "Left Chrome Sideskirt",
-			1100: "Chrome Grill Bullbar",
-			1101: "Left Chrome Flames Sideskirt",
-			1102: "Left Chrome Strip Sideskirt",
-			1103: "Covertible Roof",
-			1104: "Chrome Exhaust",
-			1105: "Slamin Exhaust",
-			1106: "Right Chrome Arches Sideskirt",
-			1107: "Left Chrome Strip Sideskirt",
-			1108: "Right Chrome Strip Sideskirt",
-			1109: "Chrome Rear Bullbars",
-			1110: "Slamin Rear Bullbars",
-			1113: "Chrome Exhaust",
-			1114: "Slamin Exhaust",
-			1115: "Chrome Front Bullbars",
-			1116: "Slamin Front Bullbars",
-			1117: "Chrome Front Bumper",
-			1118: "Right Chrome Trim Sideskirt",
-			1119: "Right Wheelcovers Sideskirt",
-			1120: "Left Chrome Trim Sideskirt",
-			1121: "Left Wheelcovers Sideskirt",
-			1122: "Right Chrome Flames Sideskirt",
-			1123: "Chrome Bars Bullbars",
-			1124: "Left Chrome Arches Sideskirt",
-			1125: "Chrome Lights Bullbars",
-			1126: "Chrome Exhaust Exhaust",
-			1127: "Slamin Exhaust Exhaust",
-			1128: "Vinyl Hardtop Roof",
-			1129: "Chrome Exhaust",
-			1130: "Hardtop Roof",
-			1131: "Softtop Roof",
-			1132: "Slamin Exhaust",
-			1133: "Right Chrome Strip Sideskirt",
-			1134: "Right Chrome Strip Sideskirt",
-			1135: "Slamin Exhaust",
-			1136: "Chrome Exhaust",
-			1137: "Left Chrome Strip Sideskirt",
-			1138: "Alien Spoiler",
-			1139: "X-Flow Spoiler",
-			1140: "X-Flow Rear Bumper",
-			1141: "Alien Rear Bumper",
-			1142: "Left Oval Vents Vents",
-			1143: "Right Oval Vents Vents",
-			1144: "Left Square Vents Vents",
-			1145: "Right Square Vents Vents",
-			1146: "X-Flow Spoiler",
-			1147: "Alien Spoiler",
-			1148: "X-Flow Rear Bumper",
-			1149: "Alien Rear Bumper",
-			1150: "Alien Rear Bumper",
-			1151: "X-Flow Rear Bumper",
-			1152: "X-Flow Front Bumper",
-			1153: "Alien Front Bumper",
-			1154: "Alien Rear Bumper",
-			1155: "Alien Front Bumper",
-			1156: "X-Flow Rear Bumper",
-			1157: "X-Flow Front Bumper",
-			1158: "X-Flow Spoiler",
-			1159: "Alien Rear Bumper",
-			1160: "Alien Front Bumper",
-			1161: "X-Flow Rear Bumper",
-			1162: "Alien Spoiler",
-			1163: "X-Flow Spoiler",
-			1164: "Alien Spoiler",
-			1165: "X-Flow Front Bumper",
-			1166: "Alien Front Bumper",
-			1167: "X-Flow Rear Bumper",
-			1168: "Alien Rear Bumper",
-			1169: "Alien Front Bumper",
-			1170: "X-Flow Front Bumper",
-			1171: "Alien Front Bumper",
-			1172: "X-Flow Front Bumper",
-			1173: "X-Flow Front Bumper",
-			1174: "Chrome Front Bumper",
-			1175: "Slamin Rear Bumper",
-			1176: "Chrome Front Bumper",
-			1177: "Slamin Rear Bumper",
-			1178: "Slamin Rear Bumper",
-			1179: "Chrome Front Bumper",
-			1180: "Chrome Rear Bumper",
-			1181: "Slamin Front Bumper",
-			1182: "Chrome Front Bumper",
-			1183: "Slamin Rear Bumper",
-			1184: "Chrome Rear Bumper",
-			1185: "Slamin Front Bumper",
-			1186: "Slamin Rear Bumper",
-			1187: "Chrome Rear Bumper",
-			1188: "Slamin Front Bumper",
-			1189: "Chrome Front Bumper",
-			1190: "Slamin Front Bumper",
-			1191: "Chrome Front Bumper",
-			1192: "Chrome Rear Bumper",
-			1193: "Slamin Rear Bumper"
-		},
+	vehicleComponents: {
+		[VRR_GAME_GTA_SA]: [   // GTA SA
+			[1000, "Pro Spoiler"],
+			[1001, "Win Spoiler"],
+			[1002, "Drag Spoiler"],
+			[1003, "Alpha Spoiler"],
+			[1004, "Champ Scoop Hood"],
+			[1005, "Fury Scoop Hood"],
+			[1006, "Roof Scoop Roof"],
+			[1007, "Right Sideskirt"],
+			[1008, "5x Nitro"],
+			[1009, "2x Nitro"],
+			[1010, "10x Nitro"],
+			[1011, "Race Scoop Hood"],
+			[1012, "Worx Scoop Hood"],
+			[1013, "Round Fog Lamps"],
+			[1014, "Champ Spoiler"],
+			[1015, "Race Spoiler"],
+			[1016, "Worx Spoiler"],
+			[1017, "Left Sideskirt"],
+			[1018, "Upswept Exhaust"],
+			[1019, "Twin Exhaust"],
+			[1020, "Large Exhaust"],
+			[1021, "Medium Exhaust"],
+			[1022, "Small Exhaust"],
+			[1023, "Fury Spoiler"],
+			[1024, "Square Fog Lamps"],
+			[1025, "Offroad Wheels"],
+			[1026, "Right Alien Sideskirt"],
+			[1027, "Left Alien Sideskirt"],
+			[1028, "Alien Exhaust"],
+			[1029, "X-Flow Exhaust"],
+			[1030, "Left X-Flow Sideskirt"],
+			[1031, "Right X-Flow Sideskirt"],
+			[1032, "Alien Roof Vent Roof"],
+			[1033, "X-Flow Roof Vent Roof"],
+			[1034, "Alien Exhaust"],
+			[1035, "X-Flow Roof Vent Roof"],
+			[1036, "Right Alien Sideskirt"],
+			[1037, "X-Flow Exhaust"],
+			[1038, "Alien Roof Vent Roof"],
+			[1039, "Left X-Flow Sideskirt"],
+			[1040, "Left Alien Sideskirt"],
+			[1041, "Right X-Flow Sideskirt"],
+			[1042, "Right Chrome Sideskirt"],
+			[1043, "Slamin Exhaust"],
+			[1044, "Chrome Exhaust"],
+			[1045, "X-Flow Exhaust"],
+			[1046, "Alien Exhaust"],
+			[1047, "Right Alien Sideskirt"],
+			[1048, "Right X-Flow Sideskirt"],
+			[1049, "Alien Spoiler"],
+			[1050, "X-Flow Spoiler"],
+			[1051, "Left Alien Sideskirt"],
+			[1052, "Left X-Flow Sideskirt"],
+			[1053, "X-Flow Roof"],
+			[1054, "Alien Roof"],
+			[1055, "Alien Roof"],
+			[1056, "Right Alien Sideskirt"],
+			[1057, "Right X-Flow Sideskirt"],
+			[1058, "Alien Spoiler"],
+			[1059, "X-Flow Exhaust"],
+			[1060, "X-Flow Spoiler"],
+			[1061, "X-Flow Roof"],
+			[1062, "Left Alien Sideskirt"],
+			[1063, "Left X-Flow Sideskirt"],
+			[1064, "Alien Exhaust"],
+			[1065, "Alien Exhaust"],
+			[1066, "X-Flow Exhaust"],
+			[1067, "Alien Roof"],
+			[1068, "X-Flow Roof"],
+			[1069, "Right Alien Sideskirt"],
+			[1070, "Right X-Flow Sideskirt"],
+			[1071, "Left Alien Sideskirt"],
+			[1072, "Left X-Flow Sideskirt"],
+			[1073, "Shadow Wheels"],
+			[1074, "Mega Wheels"],
+			[1075, "Rimshine Wheels"],
+			[1076, "Wires Wheels"],
+			[1077, "Classic Wheels"],
+			[1078, "Twist Wheels"],
+			[1079, "Cutter Wheels"],
+			[1080, "Switch Wheels"],
+			[1081, "Grove Wheels"],
+			[1082, "Import Wheels"],
+			[1083, "Dollar Wheels"],
+			[1084, "Trance Wheels"],
+			[1085, "Atomic Wheels"],
+			[1086, "Stereo Stereo"],
+			[1087, "Hydraulics Hydraulics"],
+			[1088, "Alien Roof"],
+			[1089, "X-Flow Exhaust"],
+			[1090, "Right Alien Sideskirt"],
+			[1091, "X-Flow Roof"],
+			[1092, "Alien Exhaust"],
+			[1093, "Right X-Flow Sideskirt"],
+			[1094, "Left Alien Sideskirt"],
+			[1095, "Right X-Flow Sideskirt"],
+			[1096, "Ahab Wheels"],
+			[1097, "Virtual Wheels"],
+			[1098, "Access Wheels"],
+			[1099, "Left Chrome Sideskirt"],
+			[1100, "Chrome Grill Bullbar"],
+			[1101, "Left Chrome Flames Sideskirt"],
+			[1102, "Left Chrome Strip Sideskirt"],
+			[1103, "Covertible Roof"],
+			[1104, "Chrome Exhaust"],
+			[1105, "Slamin Exhaust"],
+			[1106, "Right Chrome Arches Sideskirt"],
+			[1107, "Left Chrome Strip Sideskirt"],
+			[1108, "Right Chrome Strip Sideskirt"],
+			[1109, "Chrome Rear Bullbars"],
+			[1110, "Slamin Rear Bullbars"],
+			[1113, "Chrome Exhaust"],
+			[1114, "Slamin Exhaust"],
+			[1115, "Chrome Front Bullbars"],
+			[1116, "Slamin Front Bullbars"],
+			[1117, "Chrome Front Bumper"],
+			[1118, "Right Chrome Trim Sideskirt"],
+			[1119, "Right Wheelcovers Sideskirt"],
+			[1120, "Left Chrome Trim Sideskirt"],
+			[1121, "Left Wheelcovers Sideskirt"],
+			[1122, "Right Chrome Flames Sideskirt"],
+			[1123, "Chrome Bars Bullbars"],
+			[1124, "Left Chrome Arches Sideskirt"],
+			[1125, "Chrome Lights Bullbars"],
+			[1126, "Chrome Exhaust Exhaust"],
+			[1127, "Slamin Exhaust Exhaust"],
+			[1128, "Vinyl Hardtop Roof"],
+			[1129, "Chrome Exhaust"],
+			[1130, "Hardtop Roof"],
+			[1131, "Softtop Roof"],
+			[1132, "Slamin Exhaust"],
+			[1133, "Right Chrome Strip Sideskirt"],
+			[1134, "Right Chrome Strip Sideskirt"],
+			[1135, "Slamin Exhaust"],
+			[1136, "Chrome Exhaust"],
+			[1137, "Left Chrome Strip Sideskirt"],
+			[1138, "Alien Spoiler"],
+			[1139, "X-Flow Spoiler"],
+			[1140, "X-Flow Rear Bumper"],
+			[1141, "Alien Rear Bumper"],
+			[1142, "Left Oval Vents Vents"],
+			[1143, "Right Oval Vents Vents"],
+			[1144, "Left Square Vents Vents"],
+			[1145, "Right Square Vents Vents"],
+			[1146, "X-Flow Spoiler"],
+			[1147, "Alien Spoiler"],
+			[1148, "X-Flow Rear Bumper"],
+			[1149, "Alien Rear Bumper"],
+			[1150, "Alien Rear Bumper"],
+			[1151, "X-Flow Rear Bumper"],
+			[1152, "X-Flow Front Bumper"],
+			[1153, "Alien Front Bumper"],
+			[1154, "Alien Rear Bumper"],
+			[1155, "Alien Front Bumper"],
+			[1156, "X-Flow Rear Bumper"],
+			[1157, "X-Flow Front Bumper"],
+			[1158, "X-Flow Spoiler"],
+			[1159, "Alien Rear Bumper"],
+			[1160, "Alien Front Bumper"],
+			[1161, "X-Flow Rear Bumper"],
+			[1162, "Alien Spoiler"],
+			[1163, "X-Flow Spoiler"],
+			[1164, "Alien Spoiler"],
+			[1165, "X-Flow Front Bumper"],
+			[1166, "Alien Front Bumper"],
+			[1167, "X-Flow Rear Bumper"],
+			[1168, "Alien Rear Bumper"],
+			[1169, "Alien Front Bumper"],
+			[1170, "X-Flow Front Bumper"],
+			[1171, "Alien Front Bumper"],
+			[1172, "X-Flow Front Bumper"],
+			[1173, "X-Flow Front Bumper"],
+			[1174, "Chrome Front Bumper"],
+			[1175, "Slamin Rear Bumper"],
+			[1176, "Chrome Front Bumper"],
+			[1177, "Slamin Rear Bumper"],
+			[1178, "Slamin Rear Bumper"],
+			[1179, "Chrome Front Bumper"],
+			[1180, "Chrome Rear Bumper"],
+			[1181, "Slamin Front Bumper"],
+			[1182, "Chrome Front Bumper"],
+			[1183, "Slamin Rear Bumper"],
+			[1184, "Chrome Rear Bumper"],
+			[1185, "Slamin Front Bumper"],
+			[1186, "Slamin Rear Bumper"],
+			[1187, "Chrome Rear Bumper"],
+			[1188, "Slamin Front Bumper"],
+			[1189, "Chrome Front Bumper"],
+			[1190, "Slamin Front Bumper"],
+			[1191, "Chrome Front Bumper"],
+			[1192, "Chrome Rear Bumper"],
+			[1193, "Slamin Rear Bumper"],
+		]
 	},
 	fishingLocations: {
 		[VRR_GAME_GTA_SA]: [   // GTA San Andreas
@@ -6615,6 +6615,27 @@ let gameData = {
 		[VRR_GAME_MAFIA_THREE]: 0, // Mafia 3
 		[VRR_GAME_MAFIA_ONE_DE]: 0, // Mafia Definitive Edition
 	},
+	properties: {
+		[VRR_GAME_GTA_VC]: {
+			ApartmentBuilding1: {
+				businesses: [
+					["Manager's Office", 0, 0, toVector3(217.12, -1271.71, 12.09), toVector3(115.48, -823.76, 10.463), 6, null],
+				],
+				houses: [
+					["Apartment 101", 0, 200, toVector3(212.33, -1288.79, 19.27), toVector3(26.67, -1328.89, 13.00), 11, null],
+					["Apartment 102", 0, 200, toVector3(214.12, -1281.61, 19.27), toVector3(26.67, -1328.89, 13.00), 11, null],
+					["Apartment 103", 0, 200, toVector3(218.84, -1275.62, 19.27), toVector3(26.67, -1328.89, 13.00), 11, null],
+					["Apartment 104", 0, 200, toVector3(225.40, -1279.77, 19.27), toVector3(26.67, -1328.89, 13.00), 11, null],
+					["Apartment 105", 0, 200, toVector3(218.24, -1277.98, 19.27), toVector3(26.67, -1328.89, 13.00), 11, null],
+					["Apartment 106", 0, 200, toVector3(209.08, -1275.73, 19.27), toVector3(26.67, -1328.89, 13.00), 11, null],
+					["Apartment 107", 0, 200, toVector3(209.76, -1273.40, 19.27), toVector3(26.67, -1328.89, 13.00), 11, null],
+				],
+				npcs: [
+					["Front Desk Clerk", 160, toVector(215.11, -1272.65, 12.09), 2.95],
+				]
+			}
+		}
+	}
 };
 
 // ===========================================================================
\ No newline at end of file