diff --git a/package-lock.json b/package-lock.json
index ba6330b..9ed68df 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1,12 +1,12 @@
 {
   "name": "@bimdata/bcf-components",
-  "version": "6.0.0",
+  "version": "6.0.1-rc.1",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@bimdata/bcf-components",
-      "version": "6.0.0",
+      "version": "6.0.1-rc.1",
       "dependencies": {
         "async": "^3.2.4"
       },
diff --git a/package.json b/package.json
index 13b13a2..87c6ae1 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@bimdata/bcf-components",
-  "version": "6.0.0",
+  "version": "6.0.1-rc.1",
   "files": [
     "src",
     "vue3-plugin.js"
diff --git a/src/components/bcf-settings/BcfSettings.vue b/src/components/bcf-settings/BcfSettings.vue
index 59f9c94..131b0f2 100644
--- a/src/components/bcf-settings/BcfSettings.vue
+++ b/src/components/bcf-settings/BcfSettings.vue
@@ -80,15 +80,13 @@ export default {
   },
   emits: ["back", "close", "extension-created", "extension-updated", "extension-deleted"],
   setup(props, { emit }) {
-    const service = useService();
-
     const createExtension = async (event) => {
-      const ext = await service.createExtension(props.project, event.extensionType, event.data);
+      const ext = await useService().createExtension(props.project, event.extensionType, event.data);
       emit("extension-created", ext);
     };
 
     const updateExtension = async (event) => {
-      const ext = await service.updateExtension(
+      const ext = await useService().updateExtension(
         props.project,
         event.extensionType,
         event.extension,
@@ -98,7 +96,7 @@ export default {
     };
 
     const deleteExtension = async (event) => {
-      await service.deleteExtension(props.project, event.extensionType, event.extension);
+      await useService().deleteExtension(props.project, event.extensionType, event.extension);
       emit("extension-deleted", event.extension);
     };
 
diff --git a/src/components/bcf-topic-form/BcfTopicForm.vue b/src/components/bcf-topic-form/BcfTopicForm.vue
index 1dde4fb..9201239 100644
--- a/src/components/bcf-topic-form/BcfTopicForm.vue
+++ b/src/components/bcf-topic-form/BcfTopicForm.vue
@@ -30,7 +30,6 @@
       <template v-if="uiConfig.viewerMode">
         <BcfTopicSnapshots
           :viewpoints="viewpointsToDisplay"
-          :getViewers="getViewers"
           @create-viewpoint="createViewpoints"
           @upload-viewpoint="uploadViewpoints"
           @delete-viewpoint="deleteViewpoint"
@@ -39,7 +38,6 @@
           <BcfTopicSnapshotsActions
             v-if="viewpointsToDisplay.length > 0"
             :viewpoints="viewpointsToDisplay"
-            :getViewers="getViewers"
             @create-viewpoint="createViewpoints"
             @upload-viewpoint="uploadViewpoints"
           />
@@ -307,8 +305,6 @@ export default {
     "topic-update-error",
   ],
   setup(props, { emit }) {
-    const service = useService();
-
     const isCreation = computed(() => !props.topic);
     const nextIndex = computed(() => Math.max(0, ...props.topics.map((t) => t.index)) + 1);
 
@@ -421,6 +417,8 @@ export default {
     };
 
     const submit = async () => {
+      const service = useService();
+
       if (!topicTitle.value) {
         hasErrorTitle.value = true;
         return;
@@ -505,6 +503,7 @@ export default {
           emit("topic-updated", newTopic);
         }
       } catch (error) {
+        console.error(error);
         emit(isCreation.value ? "topic-create-error" : "topic-update-error", error);
       } finally {
         loading.value = false;
diff --git a/src/components/bcf-topic-overview/BcfTopicOverview.vue b/src/components/bcf-topic-overview/BcfTopicOverview.vue
index 6b0caef..a16ef8e 100644
--- a/src/components/bcf-topic-overview/BcfTopicOverview.vue
+++ b/src/components/bcf-topic-overview/BcfTopicOverview.vue
@@ -299,8 +299,6 @@ export default {
     "view-topic-viewpoint",
   ],
   setup(props, { emit }) {
-    const service = useService();
-
     const loading = ref(false);
     const showDeleteModal = ref(false);
 
@@ -312,14 +310,14 @@ export default {
 
     const currentUserEmail = ref("");
     const loadCurrentUserEmail = async () => {
-      currentUserEmail.value = (await service.fetchCurrentUser()).email ?? "";
+      currentUserEmail.value = (await useService().fetchCurrentUser()).email ?? "";
     };
 
     const deleteTopic = async () => {
       try {
         showDeleteModal.value = false;
         loading.value = true;
-        await service.deleteTopic(props.project, props.topic);
+        await useService().deleteTopic(props.project, props.topic);
         emit("topic-deleted", props.topic);
       } catch (error) {
         console.error(error);
diff --git a/src/components/bcf-topic-overview/bcf-topic-comments/BcfTopicComments.vue b/src/components/bcf-topic-overview/bcf-topic-comments/BcfTopicComments.vue
index 91955a0..fba1d62 100644
--- a/src/components/bcf-topic-overview/bcf-topic-comments/BcfTopicComments.vue
+++ b/src/components/bcf-topic-overview/bcf-topic-comments/BcfTopicComments.vue
@@ -144,7 +144,6 @@ export default {
   setup(props, { emit }) {
     let pluginCreatedSub, pluginDestroyedSub;
 
-    const service = useService();
     const $viewer = inject("$viewer", null);
 
     const loading = ref(false);
@@ -157,7 +156,7 @@ export default {
     const viewerSelectOptions = ref([]);
 
     const loadComments = async () => {
-      comments.value = await service.fetchTopicComments(props.project, props.topic);
+      comments.value = await useService().fetchTopicComments(props.project, props.topic);
     };
 
     const setCommentViewpoint = async () => {
@@ -180,6 +179,7 @@ export default {
 
     const submitComment = async () => {
       try {
+        const service = useService();
         loading.value = true;
         if (viewpoint.value) {
           viewpoint.value = await service.createViewpoint(
diff --git a/src/components/bcf-topic-overview/bcf-topic-comments/topic-comment/TopicComment.vue b/src/components/bcf-topic-overview/bcf-topic-comments/topic-comment/TopicComment.vue
index b15ba43..415e985 100644
--- a/src/components/bcf-topic-overview/bcf-topic-comments/topic-comment/TopicComment.vue
+++ b/src/components/bcf-topic-overview/bcf-topic-comments/topic-comment/TopicComment.vue
@@ -202,7 +202,6 @@ export default {
   setup(props, { emit }) {
     let pluginCreatedSub, pluginDestroyedSub;
 
-    const service = useService();
     const $viewer = inject("$viewer", null);
 
     const loading = ref(false);
@@ -218,7 +217,7 @@ export default {
     const toggleMenu = () => (showMenu.value = !showMenu.value);
 
     const loadViewpoint = async () => {
-      viewpoint.value = await service.fetchTopicCommentViewpoint(
+      viewpoint.value = await useService().fetchTopicCommentViewpoint(
         props.project,
         props.topic,
         props.comment
@@ -235,7 +234,7 @@ export default {
     };
     const deleteViewpoint = async () => {
       if (viewpoint.value.guid) {
-        await service.deleteViewpoint(props.project, props.topic, viewpoint.value);
+        await useService().deleteViewpoint(props.project, props.topic, viewpoint.value);
       }
       viewpoint.value = null;
     };
@@ -261,7 +260,7 @@ export default {
           return;
         }
         if (viewpoint.value && !viewpoint.value.guid) {
-          viewpoint.value = await service.createViewpoint(
+          viewpoint.value = await useService().createViewpoint(
             props.project,
             props.topic,
             viewpoint.value
@@ -273,7 +272,7 @@ export default {
         ) {
           loading.value = true;
 
-          const newComment = await service.updateComment(
+          const newComment = await useService().updateComment(
             props.project,
             props.topic,
             props.comment,
@@ -294,7 +293,7 @@ export default {
     const submitDelete = async () => {
       try {
         loading.value = true;
-        await service.deleteComment(props.project, props.topic, props.comment);
+        await useService().deleteComment(props.project, props.topic, props.comment);
         emit("comment-deleted", props.comment);
         isDeleting.value = false;
       } finally {
@@ -347,7 +346,6 @@ export default {
       submitDelete,
       submitUpdate,
       toggleMenu,
-      loadViewpoint,
       unhighlightViewer,
     };
   },