@@ -232,20 +232,10 @@ export class Viewpoint implements BCFViewpoint {
    *
    * @returns A Promise that resolves when the components have been added to the viewpoint.
    */
-  async addComponentsFromMap(fragmentIdMap: FRAGS.FragmentIdMap) {
+  addComponentsFromMap(fragmentIdMap: FRAGS.FragmentIdMap) {
     const fragments = this._components.get(FragmentsManager);
-    for (const fragmentID in fragmentIdMap) {
-      const fragment = fragments.list.get(fragmentID);
-      if (!(fragment && fragment.group)) continue;
-      const model = fragment.group;
-      const expressIDs = fragmentIdMap[fragmentID];
-      for (const expressID of expressIDs) {
-        const attrs = await model.getProperties(expressID);
-        if (!attrs) continue;
-        const globalId = attrs.GlobalId?.value;
-        if (globalId) this.selectionComponents.add(globalId);
-      }
-    }
+    const guids = fragments.fragmentIdMapToGuids(fragmentIdMap);
+    this.selectionComponents.add(...guids);
     const manager = this._components.get(Viewpoints);
     manager.list.set(this.guid, this);
   }
 
@@ -232,6 +232,32 @@ export class FragmentsManager extends Component implements Disposable {
     return fragmentIdMap;
   }
 
+  /**
+   * Converts a fragment ID map to a collection of IFC GUIDs.
+   *
+   * @param fragmentIdMap - A fragment ID map to be converted to a collection of IFC GUIDs.
+   *
+   * @returns An array of IFC GUIDs.
+   */
+  fragmentIdMapToGuids(fragmentIdMap: FRAGS.FragmentIdMap) {
+    const guids: string[] = [];
+    const modelIdMap = this.getModelIdMap(fragmentIdMap);
+    for (const modelID in modelIdMap) {
+      const model = this.groups.get(modelID);
+      if (!model) continue;
+      const expressIDs = modelIdMap[modelID];
+      for (const expressID of expressIDs) {
+        for (const [guid, id] of model.globalToExpressIDs.entries()) {
+          if (id === expressID) {
+            guids.push(guid);
+            break;
+          }
+        }
+      }
+    }
+    return guids;
+  }
+
   /**
    * Applies coordinate transformation to the provided models.
    * If no models are provided, all groups are used.