diff --git a/src/App.vue b/src/App.vue
index 73d96a651..756e3b7af 100644
--- a/src/App.vue
+++ b/src/App.vue
@@ -139,10 +139,10 @@ import * as Views from '@/views/'
 import * as Dialogs from '@/dialogs/'
 import { AuthServices } from '@/services/'
 import { CommonMixin, FilingTemplateMixin } from '@/mixins/'
-import { ActionBindingIF, ConfirmDialogType } from '@/interfaces/'
+import { AccountInformationIF, ConfirmDialogType } from '@/interfaces/'
 import { BreadcrumbIF, CompletingPartyIF } from '@bcrs-shared-components/interfaces/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
-import { RouteNames } from '@/enums/'
+import { FilingTypes, RouteNames } from '@/enums/'
 import { getEntityDashboardBreadcrumb, getMyBusinessRegistryBreadcrumb, getRegistryDashboardBreadcrumb,
   getStaffDashboardBreadcrumb } from '@/resources/BreadCrumbResources'
 import DateUtilities from '@/services/date-utilities'
@@ -188,22 +188,22 @@ export default class App extends Mixins(CommonMixin, FilingTemplateMixin) {
   @Getter(useStore) showFeeSummary!: boolean
 
   // Global actions
-  @Action(useStore) setAccountInformation!: ActionBindingIF
-  @Action(useStore) setAppValidate!: ActionBindingIF
-  @Action(useStore) setBusinessId!: ActionBindingIF
-  @Action(useStore) setCompletingParty!: ActionBindingIF
-  @Action(useStore) setComponentValidate!: ActionBindingIF
-  @Action(useStore) setCurrentDate!: ActionBindingIF
-  @Action(useStore) setCurrentJsDate!: ActionBindingIF
-  @Action(useStore) setFilingId!: ActionBindingIF
-  @Action(useStore) setFilingType!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setIsFilingPaying!: ActionBindingIF
-  @Action(useStore) setIsSaving!: ActionBindingIF
-  @Action(useStore) setKeycloakRoles!: ActionBindingIF
-  @Action(useStore) setOrgInfo!: ActionBindingIF
-  @Action(useStore) setSummaryMode!: ActionBindingIF
-  @Action(useStore) setUserInfo!: ActionBindingIF
+  @Action(useStore) setAccountInformation!: (x: AccountInformationIF) => void
+  @Action(useStore) setAppValidate!: (x: boolean) => void
+  @Action(useStore) setBusinessId!: (x: string) => void
+  @Action(useStore) setCompletingParty!: (x: CompletingPartyIF) => void
+  @Action(useStore) setComponentValidate!: (x: boolean) => void
+  @Action(useStore) setCurrentDate!: (x: string) => void
+  @Action(useStore) setCurrentJsDate!: (x: Date) => void
+  @Action(useStore) setFilingId!: (x: number) => void
+  @Action(useStore) setFilingType!: (x: FilingTypes) => void
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setIsFilingPaying!: (x: boolean) => void
+  @Action(useStore) setIsSaving!: (x: boolean) => void
+  @Action(useStore) setKeycloakRoles!: (x: string[]) => void
+  @Action(useStore) setOrgInfo!: (x: any) => void
+  @Action(useStore) setSummaryMode!: (x: boolean) => void
+  @Action(useStore) setUserInfo!: (x: any) => void
 
   // Local properties
   accountAuthorizationDialog = false
diff --git a/src/components/Alteration/AlterationSummary.vue b/src/components/Alteration/AlterationSummary.vue
index fc0bb3eaa..b23b5c10c 100644
--- a/src/components/Alteration/AlterationSummary.vue
+++ b/src/components/Alteration/AlterationSummary.vue
@@ -171,7 +171,7 @@
 <script lang="ts">
 import { Component, Emit, Mixins, Prop } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { ActionBindingIF, FeesIF, FlagsReviewCertifyIF, ResolutionsIF } from '@/interfaces/'
+import { FeesIF, FlagsReviewCertifyIF, ResolutionsIF } from '@/interfaces/'
 import { DateMixin, FilingTemplateMixin, FeeMixin } from '@/mixins/'
 import { EffectiveDateTime, NameTranslation, ShareStructures } from '@/components/common/'
 import { ResolutionDates } from '@/components/Alteration/'
@@ -197,7 +197,7 @@ export default class AlterationSummary extends Mixins(DateMixin, FeeMixin, Filin
   @Getter(useStore) isBusySaving!: boolean
 
   // Global actions
-  @Action(useStore) setEffectiveDateValid!: ActionBindingIF
+  @Action(useStore) setEffectiveDateValid!: (x: boolean) => void
 
   /** Whether to perform validation. */
   @Prop() readonly validate!: boolean
diff --git a/src/components/Alteration/Articles/Articles.vue b/src/components/Alteration/Articles/Articles.vue
index ce480b360..543264fe1 100644
--- a/src/components/Alteration/Articles/Articles.vue
+++ b/src/components/Alteration/Articles/Articles.vue
@@ -45,7 +45,7 @@ import { Action, Getter } from 'pinia-class'
 import CompanyProvisions from './CompanyProvisions.vue'
 import ResolutionDates from './ResolutionDates.vue'
 import { CommonMixin } from '@/mixins/'
-import { ActionBindingIF, BusinessInformationIF, ResolutionsIF } from '@/interfaces/'
+import { ActionKvIF, BusinessInformationIF, ResolutionsIF } from '@/interfaces/'
 import { useStore } from '@/store/store'
 
 @Component({
@@ -69,9 +69,9 @@ export default class Articles extends Mixins(CommonMixin) {
   @Getter(useStore) isAlterationFiling!: boolean
 
   // Global actions
-  @Action(useStore) setProvisionsRemoved!: ActionBindingIF
-  @Action(useStore) setNewResolutionDates!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setProvisionsRemoved!: (x: boolean) => void
+  @Action(useStore) setNewResolutionDates!: (x: string[]) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   /** Emits Have Changes event. */
   @Emit('haveChanges')
diff --git a/src/components/Alteration/Articles/ResolutionDates.vue b/src/components/Alteration/Articles/ResolutionDates.vue
index ecfc1dec7..47b693989 100644
--- a/src/components/Alteration/Articles/ResolutionDates.vue
+++ b/src/components/Alteration/Articles/ResolutionDates.vue
@@ -175,7 +175,7 @@ import { Action, Getter } from 'pinia-class'
 import { CommonMixin, DateMixin } from '@/mixins/'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker/'
 import { cloneDeep } from 'lodash'
-import { ActionBindingIF } from '@/interfaces/'
+import { ActionKvIF } from '@/interfaces/'
 import { useStore } from '@/store/store'
 
 @Component({
@@ -205,7 +205,7 @@ export default class ResolutionDates extends Mixins(CommonMixin, DateMixin) {
   @Getter(useStore) isCorrectionFiling!: boolean
 
   // Global setter
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // Local properties
   displayPreviousDates = false
diff --git a/src/components/Conversion/ConversionNOB.vue b/src/components/Conversion/ConversionNOB.vue
index dfafaca8d..dac4be0f6 100644
--- a/src/components/Conversion/ConversionNOB.vue
+++ b/src/components/Conversion/ConversionNOB.vue
@@ -157,7 +157,7 @@ import Vue from 'vue'
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { CommonMixin } from '@/mixins/'
-import { ActionBindingIF, FlagsCompanyInfoIF } from '@/interfaces/'
+import { ActionKvIF, FlagsCompanyInfoIF } from '@/interfaces/'
 import { NaicsIF } from '@bcrs-shared-components/interfaces/'
 import { isEqual } from 'lodash'
 import { useStore } from '@/store/store'
@@ -172,8 +172,8 @@ export default class ConversionNOB extends Mixins(CommonMixin) {
   @Getter(useStore) getSnapshotNaics!: NaicsIF
   @Getter(useStore) hasNaicsChanged!: boolean
 
-  @Action(useStore) setNaics!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setNaics!: (x: NaicsIF) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // local variables
   protected dropdown = false // v-model for dropdown menu
diff --git a/src/components/Restoration/ExtendTimeLimit.vue b/src/components/Restoration/ExtendTimeLimit.vue
index ad910ac64..44a6e513b 100644
--- a/src/components/Restoration/ExtendTimeLimit.vue
+++ b/src/components/Restoration/ExtendTimeLimit.vue
@@ -60,7 +60,7 @@ import Actions from '@/components/common/Actions.vue'
 import { DateMixin } from '@/mixins'
 import DateUtilities from '@/services/date-utilities'
 import { LimitedRestorationPanel } from '@bcrs-shared-components/limited-restoration-panel'
-import { ActionBindingIF, StateFilingRestorationIF } from '@/interfaces'
+import { CourtOrderIF, StateFilingRestorationIF } from '@/interfaces'
 import { useStore } from '@/store/store'
 
 @Component({
@@ -78,10 +78,10 @@ export default class ExtendTimeLimit extends Mixins(DateMixin) {
   @Getter(useStore) getRestorationExpiryDate!: string
   @Getter(useStore) getStateFilingRestoration!: StateFilingRestorationIF
 
-  @Action(useStore) setApprovalTypeValid!: ActionBindingIF
-  @Action(useStore) setExpiryValid!: ActionBindingIF
-  @Action(useStore) setRestorationCourtOrder!: ActionBindingIF
-  @Action(useStore) setRestorationExpiryDate!: ActionBindingIF
+  @Action(useStore) setApprovalTypeValid!: (x: boolean) => void
+  @Action(useStore) setExpiryValid!: (x: boolean) => void
+  @Action(useStore) setRestorationCourtOrder!: (x: CourtOrderIF) => void
+  @Action(useStore) setRestorationExpiryDate!: (x: string) => void
 
   /** Whether to show the Approval Type component. */
   get showApprovalType (): boolean {
diff --git a/src/components/SpecialResolution/Memorandum.vue b/src/components/SpecialResolution/Memorandum.vue
index 5bd071f60..4540a7ab9 100644
--- a/src/components/SpecialResolution/Memorandum.vue
+++ b/src/components/SpecialResolution/Memorandum.vue
@@ -255,7 +255,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import { HelpSection } from '@/components/common/'
-import { ActionBindingIF, EntitySnapshotIF, RulesMemorandumIF } from '@/interfaces'
+import { EntitySnapshotIF, RulesMemorandumIF } from '@/interfaces'
 import DateUtilities from '@/services/date-utilities'
 import { FormIF } from '@bcrs-shared-components/interfaces'
 import { Component, Watch } from 'vue-property-decorator'
@@ -276,9 +276,9 @@ export default class Memorandum extends Vue {
   @Getter(useStore) getSpecialResolutionMemorandum!: RulesMemorandumIF
   @Getter(useStore) hasSpecialResolutionMemorandumChanged!: boolean
 
-  @Action(useStore) setEditingMemorandum!: ActionBindingIF
-  @Action(useStore) setSpecialResolutionMemorandumValid!: ActionBindingIF
-  @Action(useStore) setSpecialResolutionMemorandum!: ActionBindingIF
+  @Action(useStore) setEditingMemorandum!: (x: boolean) => void
+  @Action(useStore) setSpecialResolutionMemorandumValid!: (x: boolean) => void
+  @Action(useStore) setSpecialResolutionMemorandum!: (x: RulesMemorandumIF) => void
 
   $refs!: {
     memorandumForm: FormIF
diff --git a/src/components/SpecialResolution/Resolution.vue b/src/components/SpecialResolution/Resolution.vue
index c889ea2c1..462791f38 100644
--- a/src/components/SpecialResolution/Resolution.vue
+++ b/src/components/SpecialResolution/Resolution.vue
@@ -170,7 +170,6 @@
 import Vue from 'vue'
 import { Component, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { ActionBindingIF } from '@/interfaces/'
 import HelpResolution from './HelpResolution.vue'
 import InstructionalText from './InstructionalText.vue'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker/'
@@ -198,8 +197,8 @@ export default class Resolution extends Vue {
   @Getter(useStore) isSpecialResolutionFiling: boolean
   @Getter(useStore) showSpecialResolutionResolution!: boolean
 
-  @Action(useStore) setEditingSpecialResolution!: ActionBindingIF
-  @Action(useStore) setSpecialResolution!: ActionBindingIF
+  @Action(useStore) setEditingSpecialResolution!: (x: boolean) => void
+  @Action(useStore) setSpecialResolution!: (x: SpecialResolutionIF) => void
 
   $refs!: {
     resolutionEditor: FormIF,
diff --git a/src/components/SpecialResolution/ResolutionEditor.vue b/src/components/SpecialResolution/ResolutionEditor.vue
index 4cffa44d1..c177bc85c 100644
--- a/src/components/SpecialResolution/ResolutionEditor.vue
+++ b/src/components/SpecialResolution/ResolutionEditor.vue
@@ -144,7 +144,6 @@ import {
 } from 'tiptap-vuetify'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker/'
 import { useStore } from '@/store/store'
-import { ActionBindingIF } from '@/interfaces'
 import { VuetifyRuleFunction } from '@/types'
 import { SpecialResolutionIF } from '@bcrs-shared-components/interfaces'
 import DateUtilities from '@/services/date-utilities'
@@ -161,8 +160,8 @@ export default class ResolutionEditor extends Vue {
   @Getter(useStore) getCurrentDate!: string
   @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
 
-  @Action(useStore) setSpecialResolution!: ActionBindingIF
-  @Action(useStore) setSpecialResolutionValid!: ActionBindingIF
+  @Action(useStore) setSpecialResolution!: (x: SpecialResolutionIF) => void
+  @Action(useStore) setSpecialResolutionValid!: (x: boolean) => void
 
   @Prop({ default: false }) readonly isEditing!: boolean
 
diff --git a/src/components/SpecialResolution/ResolutionSummary.vue b/src/components/SpecialResolution/ResolutionSummary.vue
index cccf0dcff..d90401775 100644
--- a/src/components/SpecialResolution/ResolutionSummary.vue
+++ b/src/components/SpecialResolution/ResolutionSummary.vue
@@ -149,7 +149,7 @@
 <script lang="ts">
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { ActionBindingIF, FormIF, EntitySnapshotIF } from '@/interfaces/'
+import { FormIF, EntitySnapshotIF } from '@/interfaces/'
 import { CommonMixin, DateMixin } from '@/mixins/'
 import { HelpSection } from '@/components/common/'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker/'
@@ -168,8 +168,8 @@ export default class ResolutionSummary extends Mixins(CommonMixin, DateMixin) {
   @Getter(useStore) getSpecialResolutionConfirmValid!: boolean
   @Getter(useStore) getEntitySnapshot!: EntitySnapshotIF
 
-  @Action(useStore) setSpecialResolution!: ActionBindingIF
-  @Action(useStore) setSpecialResolutionConfirmStateValidity!: ActionBindingIF
+  @Action(useStore) setSpecialResolution!: (x: SpecialResolutionIF) => void
+  @Action(useStore) setSpecialResolutionConfirmStateValidity!: (x: boolean) => void
 
   // Refs
   $refs!: {
diff --git a/src/components/SpecialResolution/Rules.vue b/src/components/SpecialResolution/Rules.vue
index 93b4b3c5a..592c4dc66 100644
--- a/src/components/SpecialResolution/Rules.vue
+++ b/src/components/SpecialResolution/Rules.vue
@@ -333,7 +333,7 @@
 <script lang="ts">
 import Vue from 'vue'
 import { HelpSection } from '@/components/common/'
-import { ActionBindingIF, EntitySnapshotIF, RulesMemorandumIF } from '@/interfaces'
+import { EntitySnapshotIF, RulesMemorandumIF } from '@/interfaces'
 import DateUtilities from '@/services/date-utilities'
 import { FormIF } from '@bcrs-shared-components/interfaces'
 import { Component, Watch } from 'vue-property-decorator'
@@ -360,9 +360,9 @@ export default class Rules extends Vue {
     @Getter(useStore) getNameRequestLegalName!: string
     @Getter(useStore) hasSpecialResolutionRulesChanged!: boolean
 
-    @Action(useStore) setEditingRules!: ActionBindingIF
-    @Action(useStore) setSpecialResolutionRules!: ActionBindingIF
-    @Action(useStore) setSpecialResolutionRulesValid!: ActionBindingIF
+    @Action(useStore) setEditingRules!: (x: boolean) => void
+    @Action(useStore) setSpecialResolutionRules!: (x: RulesMemorandumIF) => void
+    @Action(useStore) setSpecialResolutionRulesValid!: (x: boolean) => void
 
     $refs!: {
       rulesForm: FormIF,
diff --git a/src/components/SpecialResolution/SigningParty.vue b/src/components/SpecialResolution/SigningParty.vue
index a1c7568f5..1d015cd4b 100644
--- a/src/components/SpecialResolution/SigningParty.vue
+++ b/src/components/SpecialResolution/SigningParty.vue
@@ -112,7 +112,6 @@
 <script lang="ts">
 import Vue from 'vue'
 import { Action, Getter } from 'pinia-class'
-import { ActionBindingIF } from '@/interfaces/'
 import { useStore } from '@/store/store'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker/'
 import { SpecialResolutionIF, PersonIF } from '@bcrs-shared-components/interfaces/'
@@ -131,8 +130,8 @@ export default class SigningParty extends Vue {
   @Getter(useStore) getSpecialResolution!: SpecialResolutionIF
   @Getter(useStore) isSpecialResolutionFiling: boolean
 
-  @Action(useStore) setSpecialResolution!: ActionBindingIF
-  @Action(useStore) setSpecialResolutionSignatureValid!: ActionBindingIF
+  @Action(useStore) setSpecialResolution!: (x: SpecialResolutionIF) => void
+  @Action(useStore) setSpecialResolutionSignatureValid!: (x: boolean) => void
 
   @Prop({ default: false }) readonly isEditing!: boolean
 
diff --git a/src/components/SpecialResolution/UploadRules.vue b/src/components/SpecialResolution/UploadRules.vue
index 0fe2f87a5..4f6da5440 100644
--- a/src/components/SpecialResolution/UploadRules.vue
+++ b/src/components/SpecialResolution/UploadRules.vue
@@ -46,7 +46,7 @@
 import Vue from 'vue'
 import { Component, Prop } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { ActionBindingIF, FormIF, RulesMemorandumIF } from '@/interfaces'
+import { FormIF, RulesMemorandumIF } from '@/interfaces'
 import { PageSizes } from '@/enums/'
 import FileUploadPdf from '@/components/common/FileUploadPdf.vue'
 import { useStore } from '@/store/store'
@@ -61,7 +61,7 @@ export default class UploadRules extends Vue {
   @Getter(useStore) getSpecialResolutionRules!: RulesMemorandumIF
   @Getter(useStore) getUserInfo!: any
 
-  @Action(useStore) setSpecialResolutionRules!: ActionBindingIF
+  @Action(useStore) setSpecialResolutionRules!: RulesMemorandumIF
 
   @Prop({ default: false })
   readonly invalidSection: boolean
diff --git a/src/components/ViewWrapper.vue b/src/components/ViewWrapper.vue
index 1baf89d88..87ff1c369 100644
--- a/src/components/ViewWrapper.vue
+++ b/src/components/ViewWrapper.vue
@@ -70,7 +70,7 @@ import { Actions, EntityInfo } from '@/components/common/'
 import { ConfirmDialog as ConfirmDialogShared } from '@bcrs-shared-components/confirm-dialog/'
 import { LegalServices } from '@/services/'
 import { CommonMixin, FilingTemplateMixin } from '@/mixins/'
-import { FilingDataIF, ActionBindingIF, ConfirmDialogType, FlagsReviewCertifyIF, FlagsCompanyInfoIF,
+import { FilingDataIF, ConfirmDialogType, FlagsReviewCertifyIF, FlagsCompanyInfoIF,
   AlterationFilingIF, ChgRegistrationFilingIF, ConversionFilingIF, RestorationFilingIF,
   SpecialResolutionFilingIF } from '@/interfaces/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
@@ -116,12 +116,12 @@ export default class ViewWrapper extends Mixins(CommonMixin, FilingTemplateMixin
   @Getter(useStore) showFeeSummary!: boolean
 
   // Global actions
-  @Action(useStore) setAppValidate!: ActionBindingIF
-  @Action(useStore) setComponentValidate!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setIsFilingPaying!: ActionBindingIF
-  @Action(useStore) setIsSaving!: ActionBindingIF
-  @Action(useStore) setSummaryMode!: ActionBindingIF
+  @Action(useStore) setAppValidate!: (x: boolean) => void
+  @Action(useStore) setComponentValidate!: (x: boolean) => void
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setIsFilingPaying!: (x: boolean) => void
+  @Action(useStore) setIsSaving!: (x: boolean) => void
+  @Action(useStore) setSummaryMode!: (x: boolean) => void
 
   // Local properties
   protected accountAuthorizationDialog = false
diff --git a/src/components/common/Actions.vue b/src/components/common/Actions.vue
index f4d796309..9c894d18c 100644
--- a/src/components/common/Actions.vue
+++ b/src/components/common/Actions.vue
@@ -64,7 +64,6 @@
 <script lang="ts">
 import { Component, Mixins } from 'vue-property-decorator'
 import { Getter, Action } from 'pinia-class'
-import { ActionBindingIF } from '@/interfaces/'
 import { DateMixin, FilingTemplateMixin, NameRequestMixin } from '@/mixins/'
 import { LegalServices } from '@/services/'
 import { Navigate } from '@/utils/'
@@ -86,10 +85,10 @@ export default class Actions extends Mixins(DateMixin, FilingTemplateMixin, Name
   @Getter(useStore) isSavingResuming!: boolean
 
   // Global actions
-  @Action(useStore) setIsSaving!: ActionBindingIF
-  @Action(useStore) setIsSavingResuming!: ActionBindingIF
-  @Action(useStore) setIsFilingPaying!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
+  @Action(useStore) setIsSaving!: (x: boolean) => void
+  @Action(useStore) setIsSavingResuming!: (x: boolean) => void
+  @Action(useStore) setIsFilingPaying!: (x: boolean) => void
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
 
   /** True if the Save button should be disabled. */
   get isSaveButtonDisabled (): boolean {
diff --git a/src/components/common/CertifySection.vue b/src/components/common/CertifySection.vue
index a15c8c41d..d79a3a867 100644
--- a/src/components/common/CertifySection.vue
+++ b/src/components/common/CertifySection.vue
@@ -39,7 +39,7 @@ import { Component, Mixins, Prop } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { Certify as CertifyShared } from '@bcrs-shared-components/certify/'
 import { DateMixin } from '@/mixins/'
-import { ActionBindingIF, CertifyIF, ResourceIF } from '@/interfaces/'
+import { CertifyIF, ResourceIF } from '@/interfaces/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
 import { useStore } from '@/store/store'
 
@@ -55,8 +55,8 @@ export default class CertifySection extends Mixins(DateMixin) {
   @Getter(useStore) isRoleStaff!: boolean
   @Getter(useStore) getEntityType!: CorpTypeCd
 
-  @Action(useStore) setCertifyState!: ActionBindingIF
-  @Action(useStore) setCertifyStateValidity!: ActionBindingIF
+  @Action(useStore) setCertifyState!: (x: CertifyIF) => void
+  @Action(useStore) setCertifyStateValidity!: (x: boolean) => void
 
   /** Prop to provide section number. */
   @Prop({ default: '' }) readonly sectionNumber!: string
diff --git a/src/components/common/CompletingParty.vue b/src/components/common/CompletingParty.vue
index d5f5c1450..9126af296 100644
--- a/src/components/common/CompletingParty.vue
+++ b/src/components/common/CompletingParty.vue
@@ -25,7 +25,6 @@
 import Vue from 'vue'
 import { Component, Prop } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { ActionBindingIF } from '@/interfaces/'
 import { CompletingPartyIF } from '@bcrs-shared-components/interfaces/'
 import { CompletingParty as CompletingPartyShared } from '@bcrs-shared-components/completing-party/'
 import { DefaultAddressSchema } from '@/schemas/'
@@ -49,8 +48,8 @@ export default class CompletingParty extends Vue {
   @Getter(useStore) isSbcStaff!: boolean
 
   // store actions
-  @Action(useStore) setCompletingParty!: ActionBindingIF
-  @Action(useStore) setCompletingPartyValidity!: ActionBindingIF
+  @Action(useStore) setCompletingParty!: (x: CompletingPartyIF) => void
+  @Action(useStore) setCompletingPartyValidity!: (x: boolean) => void
 
   // Declaration for template
   readonly DefaultAddressSchema = DefaultAddressSchema
diff --git a/src/components/common/CourtOrderPoa.vue b/src/components/common/CourtOrderPoa.vue
index e04c9b606..5f7c3715b 100644
--- a/src/components/common/CourtOrderPoa.vue
+++ b/src/components/common/CourtOrderPoa.vue
@@ -36,7 +36,7 @@ import Vue from 'vue'
 import { Component, Prop } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { CourtOrderPoa as CourtOrderPoaShared } from '@bcrs-shared-components/court-order-poa'
-import { ActionBindingIF, FlagsReviewCertifyIF } from '@/interfaces/'
+import { FlagsReviewCertifyIF } from '@/interfaces/'
 import { useStore } from '@/store/store'
 
 @Component({
@@ -55,9 +55,9 @@ export default class CourtOrderPoa extends Vue {
   @Getter(useStore) getHasPlanOfArrangement!: boolean
 
   // Store actions
-  @Action(useStore) setValidCourtOrder!: ActionBindingIF
-  @Action(useStore) setHasPlanOfArrangement!: ActionBindingIF
-  @Action(useStore) setFileNumber!: ActionBindingIF
+  @Action(useStore) setValidCourtOrder!: (x: boolean) => void
+  @Action(useStore) setHasPlanOfArrangement!: (x: boolean) => void
+  @Action(useStore) setFileNumber!: (x: string) => void
 
   /** True if this component is invalid. */
   get invalidCourtOrder (): boolean {
diff --git a/src/components/common/Detail.vue b/src/components/common/Detail.vue
index 326d5ae87..a2941caec 100644
--- a/src/components/common/Detail.vue
+++ b/src/components/common/Detail.vue
@@ -46,7 +46,6 @@
 import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { DetailComment as DetailCommentShared } from '@bcrs-shared-components/detail-comment/'
 import { Action } from 'pinia-class'
-import { ActionBindingIF } from '@/interfaces/'
 import { FilingTemplateMixin } from '@/mixins'
 
 import { useStore } from '@/store/store'
@@ -65,7 +64,7 @@ export default class Detail extends Mixins(FilingTemplateMixin) {
 
   @Prop({ default: 2 }) readonly rowCount!: number
 
-  @Action(useStore) setDetailValidity!: ActionBindingIF
+  @Action(useStore) setDetailValidity!: (x: boolean) => void
 
   protected comment = null as string
 
diff --git a/src/components/common/DocumentsDelivery.vue b/src/components/common/DocumentsDelivery.vue
index 0287f1f3d..39c64b7f5 100644
--- a/src/components/common/DocumentsDelivery.vue
+++ b/src/components/common/DocumentsDelivery.vue
@@ -84,7 +84,7 @@ import { Component, Mixins, Emit, Watch, Prop } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { CommonMixin } from '@/mixins/'
 import { FilingNames } from '@/enums/'
-import { ActionBindingIF, FlagsReviewCertifyIF, ResourceIF } from '@/interfaces/'
+import { FlagsReviewCertifyIF, ResourceIF } from '@/interfaces/'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces/'
 
 import { useStore } from '@/store/store'
@@ -103,8 +103,8 @@ export default class DocumentsDelivery extends Mixins(CommonMixin) {
   @Getter(useStore) getResource!: ResourceIF
 
   // Global actions
-  @Action(useStore) setDocumentOptionalEmail!: ActionBindingIF
-  @Action(useStore) setDocumentOptionalEmailValidity!: ActionBindingIF
+  @Action(useStore) setDocumentOptionalEmail!: (x: string) => void
+  @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
 
   /** Prop to provide section number. */
   @Prop({ default: '' }) readonly sectionNumber!: string
diff --git a/src/components/common/PeopleAndRoles/PeopleAndRoles.vue b/src/components/common/PeopleAndRoles/PeopleAndRoles.vue
index d14cdad3e..2fed287c7 100644
--- a/src/components/common/PeopleAndRoles/PeopleAndRoles.vue
+++ b/src/components/common/PeopleAndRoles/PeopleAndRoles.vue
@@ -291,7 +291,7 @@ import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { cloneDeep, isEmpty } from 'lodash'
 import { IsSame } from '@/utils/'
-import { ActionBindingIF, EmptyOrgPerson, EntitySnapshotIF, HelpSectionIF, OrgPersonIF, ResourceIF,
+import { ActionKvIF, EmptyOrgPerson, EntitySnapshotIF, HelpSectionIF, OrgPersonIF, ResourceIF,
   RoleIF } from '@/interfaces/'
 import { ActionTypes, CompareModes, PartyTypes, RoleTypes } from '@/enums/'
 import { HelpSection } from '@/components/common/'
@@ -334,11 +334,11 @@ export default class PeopleAndRoles extends Mixins(CommonMixin, DateMixin, OrgPe
   @Getter(useStore) isSoleProp!: boolean
 
   // Global actions
-  @Action(useStore) setEditingPeopleAndRoles!: ActionBindingIF
-  @Action(useStore) setPeopleAndRoles!: ActionBindingIF
-  @Action(useStore) setPeopleAndRolesChanged!: ActionBindingIF
-  @Action(useStore) setPeopleAndRolesValidity!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setEditingPeopleAndRoles!: (x: boolean) => void
+  @Action(useStore) setPeopleAndRoles!: (x: OrgPersonIF[]) => void
+  @Action(useStore) setPeopleAndRolesChanged!: (x: boolean) => void
+  @Action(useStore) setPeopleAndRolesValidity!: (x: boolean) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // Local properties
   isAddingEditingOrgPerson = false
diff --git a/src/components/common/ShareStructure/ShareStructures.vue b/src/components/common/ShareStructure/ShareStructures.vue
index 9b5434057..f42bb9eb9 100644
--- a/src/components/common/ShareStructure/ShareStructures.vue
+++ b/src/components/common/ShareStructure/ShareStructures.vue
@@ -34,7 +34,7 @@ import { ShareStructure as ShareStructureShared } from '@bcrs-shared-components/
 import { ResolutionDateDialog } from '@/dialogs/'
 import { CommonMixin } from '@/mixins/'
 
-import { ActionBindingIF, EntitySnapshotIF, ShareClassIF, ShareStructureIF, FlagsCompanyInfoIF }
+import { ActionKvIF, EntitySnapshotIF, ShareClassIF, ShareStructureIF, FlagsCompanyInfoIF }
   from '@/interfaces/'
 
 import { useStore } from '@/store/store'
@@ -62,11 +62,11 @@ export default class ShareStructures extends Mixins(CommonMixin) {
   @Getter(useStore) isAlterationFiling!: boolean
 
   // Global actions
-  @Action(useStore) setCreateShareStructureStepValidity!: ActionBindingIF
-  @Action(useStore) setEditingShareStructure!: ActionBindingIF
-  @Action(useStore) setShareClasses!: ActionBindingIF
-  @Action(useStore) setShareStructureChanged!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setCreateShareStructureStepValidity!: (x: boolean) => void
+  @Action(useStore) setEditingShareStructure!: (x: boolean) => void
+  @Action(useStore) setShareClasses!: (x: ShareClassIF[]) => void
+  @Action(useStore) setShareStructureChanged!: (x: boolean) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // Local propertiues
   protected isEditing = false
diff --git a/src/components/common/StaffPayment.vue b/src/components/common/StaffPayment.vue
index b551f0db9..af73fd0f0 100644
--- a/src/components/common/StaffPayment.vue
+++ b/src/components/common/StaffPayment.vue
@@ -36,7 +36,7 @@ import { Action, Getter } from 'pinia-class'
 import { StaffPayment as StaffPaymentShared } from '@bcrs-shared-components/staff-payment/'
 
 // Interfaces and Enums
-import { ActionBindingIF, FlagsReviewCertifyIF } from '@/interfaces/'
+import { FlagsReviewCertifyIF } from '@/interfaces/'
 import { StaffPaymentIF } from '@bcrs-shared-components/interfaces/'
 import { StaffPaymentOptions } from '@bcrs-shared-components/enums/'
 
@@ -54,8 +54,8 @@ export default class StaffPayment extends Vue {
   @Getter(useStore) getStaffPayment!: StaffPaymentIF
 
   // Global actions
-  @Action(useStore) setStaffPayment!: ActionBindingIF
-  @Action(useStore) setStaffPaymentValidity!: ActionBindingIF
+  @Action(useStore) setStaffPayment!: (x: StaffPaymentIF) => void
+  @Action(useStore) setStaffPaymentValidity!: (x: boolean) => void
 
   /** Prop to provide section number. */
   @Prop({ default: '' }) readonly sectionNumber!: string
diff --git a/src/components/common/TransactionalFolioNumber.vue b/src/components/common/TransactionalFolioNumber.vue
index 6220131d5..87a212e8c 100644
--- a/src/components/common/TransactionalFolioNumber.vue
+++ b/src/components/common/TransactionalFolioNumber.vue
@@ -54,7 +54,7 @@
 import { Component, Mixins, Prop, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { CommonMixin } from '@/mixins/'
-import { ActionBindingIF, FlagsReviewCertifyIF, FormFieldType } from '@/interfaces/'
+import { FlagsReviewCertifyIF, FormFieldType } from '@/interfaces/'
 import { VuetifyRuleFunction } from '@/types'
 
 import { useStore } from '@/store/store'
@@ -72,8 +72,8 @@ export default class TransactionalFolioNumber extends Mixins(CommonMixin) {
   @Getter(useStore) getFlagsReviewCertify!: FlagsReviewCertifyIF
 
   // Global actions
-  @Action(useStore) setTransactionalFolioNumber!: ActionBindingIF
-  @Action(useStore) setTransactionalFolioNumberValidity!: ActionBindingIF
+  @Action(useStore) setTransactionalFolioNumber!: (x: string) => void
+  @Action(useStore) setTransactionalFolioNumberValidity!: (x: boolean) => void
 
   /** Prop to provide section number. */
   @Prop({ default: '' }) readonly sectionNumber!: string
diff --git a/src/components/common/YourCompany/AssociationType.vue b/src/components/common/YourCompany/AssociationType.vue
index f3df1459c..3dc76d341 100644
--- a/src/components/common/YourCompany/AssociationType.vue
+++ b/src/components/common/YourCompany/AssociationType.vue
@@ -167,7 +167,7 @@ import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { CoopTypes } from '@/enums'
 import { CommonMixin } from '@/mixins'
-import { ActionBindingIF, BusinessInformationIF, EntitySnapshotIF } from '@/interfaces'
+import { ActionKvIF, BusinessInformationIF, EntitySnapshotIF } from '@/interfaces'
 import { VuetifyRuleFunction } from '@/types'
 import { CoopTypeToDescription } from '@/utils'
 import { useStore } from '@/store/store'
@@ -184,9 +184,9 @@ export default class AssociationType extends Mixins(CommonMixin) {
   @Getter(useStore) hasAssociationTypeChanged!: boolean
 
   /** Global actions */
-  @Action(useStore) setBusinessInformation!: ActionBindingIF
-  @Action(useStore) setEditingAssociationType!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setBusinessInformation!: (x: BusinessInformationIF) => void
+  @Action(useStore) setEditingAssociationType!: (x: boolean) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   /** Select options */
   readonly associationTypeOptions: Array<any> = [
diff --git a/src/components/common/YourCompany/BusinessContactInfo.vue b/src/components/common/YourCompany/BusinessContactInfo.vue
index 69f635498..d4b35cba7 100644
--- a/src/components/common/YourCompany/BusinessContactInfo.vue
+++ b/src/components/common/YourCompany/BusinessContactInfo.vue
@@ -26,7 +26,7 @@ import { Action, Getter } from 'pinia-class'
 import { ContactInfo as ContactInfoShared } from '@bcrs-shared-components/contact-info/'
 import { AuthServices } from '@/services/'
 import { CommonMixin } from '@/mixins/'
-import { ActionBindingIF, ResourceIF, EntitySnapshotIF, FlagsCompanyInfoIF } from '@/interfaces/'
+import { ActionKvIF, ResourceIF, EntitySnapshotIF, FlagsCompanyInfoIF } from '@/interfaces/'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces/'
 import { isEqual } from 'lodash'
 import { useStore } from '@/store/store'
@@ -50,8 +50,8 @@ export default class BusinessContactInfo extends Mixins(CommonMixin) {
   @Getter(useStore) isFirmChangeFiling!: boolean
 
   // Global setters
-  @Action(useStore) setBusinessContact!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setBusinessContact!: (x: ContactPointIF) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // Local variable
   protected isEditingContact = false
diff --git a/src/components/common/YourCompany/BusinessStartDate.vue b/src/components/common/YourCompany/BusinessStartDate.vue
index fff34fcfa..4ebacb7d9 100644
--- a/src/components/common/YourCompany/BusinessStartDate.vue
+++ b/src/components/common/YourCompany/BusinessStartDate.vue
@@ -173,7 +173,7 @@ import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Getter, Action } from 'pinia-class'
 import { CommonMixin, DateMixin } from '@/mixins/'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker'
-import { ActionBindingIF, FlagsCompanyInfoIF } from '@/interfaces'
+import { ActionKvIF, FlagsCompanyInfoIF } from '@/interfaces'
 import { useStore } from '@/store/store'
 
 @Component({
@@ -197,8 +197,8 @@ export default class BusinessStartDate extends Mixins(CommonMixin, DateMixin) {
   @Getter(useStore) isRoleStaff!: boolean
 
   // Global setter
-  @Action(useStore) setCorrectionStartDate!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setCorrectionStartDate!: (x: string) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   dropdown = false
   onEditMode = false
diff --git a/src/components/common/YourCompany/BusinessType.vue b/src/components/common/YourCompany/BusinessType.vue
index 3d9cd439d..e753a7fe9 100644
--- a/src/components/common/YourCompany/BusinessType.vue
+++ b/src/components/common/YourCompany/BusinessType.vue
@@ -15,7 +15,7 @@
 import Vue from 'vue'
 import { Component, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { ActionBindingIF } from '@/interfaces/'
+import { ActionKvIF } from '@/interfaces/'
 import ChangeBusinessType from '@/components/common/YourCompany/ChangeBusinessType.vue'
 import { useStore } from '@/store/store'
 
@@ -29,7 +29,7 @@ export default class BusinessType extends Vue {
   @Getter(useStore) getComponentValidate!: boolean
 
   // global setters
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // local variable
   protected isEditingType = false
diff --git a/src/components/common/YourCompany/ChangeBusinessType.vue b/src/components/common/YourCompany/ChangeBusinessType.vue
index e3a7a6869..ae7d68d75 100644
--- a/src/components/common/YourCompany/ChangeBusinessType.vue
+++ b/src/components/common/YourCompany/ChangeBusinessType.vue
@@ -262,7 +262,7 @@ import BcRegEntityDetails from '@/components/Alteration/BcRegEntityDetails.vue'
 import { BcRegContacts } from '@/components/common/'
 import { CommonMixin } from '@/mixins/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
-import { ActionBindingIF, EntitySnapshotIF, EntityTypeOption, ResourceIF } from '@/interfaces/'
+import { EntitySnapshotIF, EntityTypeOption, NameRequestIF, ResourceIF } from '@/interfaces/'
 import { GetFeatureFlag, ResourceUtilities } from '@/utils'
 import { useStore } from '@/store/store'
 
@@ -296,9 +296,9 @@ export default class ChangeBusinessType extends Mixins(CommonMixin) {
   @Getter(useStore) isNameChangedByType!: boolean
   @Getter(useStore) isNumberedCompany!: boolean
 
-  @Action(useStore) setEntityType!: ActionBindingIF
-  @Action(useStore) setNameRequest!: ActionBindingIF
-  @Action(useStore) setNameChangedByType!: ActionBindingIF
+  @Action(useStore) setEntityType!: (x: CorpTypeCd) => void
+  @Action(useStore) setNameRequest!: (x: NameRequestIF) => void
+  @Action(useStore) setNameChangedByType!: (x: boolean) => void
 
   selectedEntityType = null as CorpTypeCd
   confirmArticles = false
diff --git a/src/components/common/YourCompany/CorrectName/CorrectCompanyName.vue b/src/components/common/YourCompany/CorrectName/CorrectCompanyName.vue
index caac7c78f..903335f09 100644
--- a/src/components/common/YourCompany/CorrectName/CorrectCompanyName.vue
+++ b/src/components/common/YourCompany/CorrectName/CorrectCompanyName.vue
@@ -23,7 +23,7 @@
 import { Component, Prop, Watch, Emit, Mixins } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { CommonMixin } from '@/mixins/'
-import { ActionBindingIF, NameRequestIF } from '@/interfaces/'
+import { NameRequestIF } from '@/interfaces/'
 import { CorrectNameOptions } from '@/enums/'
 import { useStore } from '@/store/store'
 
@@ -32,7 +32,7 @@ export default class CorrectCompanyName extends Mixins(CommonMixin) {
   /** Form Submission Prop */
   @Prop({ default: null }) readonly formType!: CorrectNameOptions
 
-  @Action(useStore) setNameRequest!: ActionBindingIF
+  @Action(useStore) setNameRequest!: (x: NameRequestIF) => void
 
   @Getter(useStore) getNameRequestLegalName!: string
   @Getter(useStore) getNameRequest!: NameRequestIF
diff --git a/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue b/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue
index 048e858d1..1920a1a11 100644
--- a/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue
+++ b/src/components/common/YourCompany/CorrectName/CorrectNameRequest.vue
@@ -101,7 +101,7 @@ import { Component, Prop, Watch, Emit, Mixins } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { ConfirmDialog as ConfirmDialogShared } from '@bcrs-shared-components/confirm-dialog/'
 import { CommonMixin, NameRequestMixin } from '@/mixins/'
-import { ActionBindingIF, ConfirmDialogType, NameRequestApplicantIF, NameRequestIF, NrCorrectionIF,
+import { ConfirmDialogType, NameRequestApplicantIF, NameRequestIF, NrCorrectionIF,
   NrResponseIF } from '@/interfaces/'
 import { CorrectNameOptions } from '@/enums/'
 import { CorpTypeCd, GetCorpFullDescription } from '@bcrs-shared-components/corp-type-module/'
@@ -129,9 +129,9 @@ export default class CorrectNameRequest extends Mixins(CommonMixin, NameRequestM
   @Getter(useStore) getNameRequest!: NameRequestIF
   @Getter(useStore) getEntityType!: CorpTypeCd
 
-  @Action(useStore) setNameRequest!: ActionBindingIF
-  @Action(useStore) setEntityType!: ActionBindingIF
-  @Action(useStore) setEntityTypeChangedByName!: ActionBindingIF
+  @Action(useStore) setNameRequest!: (x: NameRequestIF) => void
+  @Action(useStore) setEntityType!: (x: CorpTypeCd) => void
+  @Action(useStore) setEntityTypeChangedByName!: (x: boolean) => void
 
   // Local properties
   formValid = false
diff --git a/src/components/common/YourCompany/CorrectName/CorrectNameToNumber.vue b/src/components/common/YourCompany/CorrectName/CorrectNameToNumber.vue
index 08717be3d..91fffd2a6 100644
--- a/src/components/common/YourCompany/CorrectName/CorrectNameToNumber.vue
+++ b/src/components/common/YourCompany/CorrectName/CorrectNameToNumber.vue
@@ -23,7 +23,7 @@ import { Component, Prop, Watch, Emit } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 
 // Interfaces && enums
-import { ActionBindingIF, NameRequestIF } from '@/interfaces/'
+import { NameRequestIF } from '@/interfaces/'
 import { CorrectNameOptions } from '@/enums/'
 import { useStore } from '@/store/store'
 
@@ -32,7 +32,7 @@ export default class CorrectNameToNumber extends Vue {
   /** Form Submission Prop */
   @Prop({ default: null }) readonly formType!: CorrectNameOptions
 
-  @Action(useStore) setNameRequest!: ActionBindingIF
+  @Action(useStore) setNameRequest!: (x: NameRequestIF) => void
 
   @Getter(useStore) getNameRequest!: NameRequestIF
   @Getter(useStore) getBusinessId!: string
diff --git a/src/components/common/YourCompany/EntityName.vue b/src/components/common/YourCompany/EntityName.vue
index 5b17ac19e..11e28ffe1 100644
--- a/src/components/common/YourCompany/EntityName.vue
+++ b/src/components/common/YourCompany/EntityName.vue
@@ -248,7 +248,7 @@
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { CoopTypes, CorrectNameOptions } from '@/enums/'
-import { ActionBindingIF, EntitySnapshotIF, NameRequestApplicantIF, NameRequestIF }
+import { ActionKvIF, BusinessInformationIF, EntitySnapshotIF, NameRequestApplicantIF, NameRequestIF }
   from '@/interfaces/'
 import CorrectName from '@/components/common/YourCompany/CorrectName/CorrectName.vue'
 import { NameRequestMixin } from '@/mixins'
@@ -289,12 +289,12 @@ export default class EntityName extends Mixins(NameRequestMixin) {
   @Getter(useStore) isEntityTypeChangedByName!: boolean
 
   // store actions
-  @Action(useStore) setBusinessInformation!: ActionBindingIF
-  @Action(useStore) setEditingCompanyName!: ActionBindingIF
-  @Action(useStore) setNameRequest!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
-  @Action(useStore) setEntityType!: ActionBindingIF
-  @Action(useStore) setEntityTypeChangedByName!: ActionBindingIF
+  @Action(useStore) setBusinessInformation!: (x: BusinessInformationIF) => void
+  @Action(useStore) setEditingCompanyName!: (x: boolean) => void
+  @Action(useStore) setNameRequest!: (x: NameRequestIF) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
+  @Action(useStore) setEntityType!: (x: CorpTypeCd) => void
+  @Action(useStore) setEntityTypeChangedByName!: (x: boolean) => void
 
   // Returns true if the undo button should be displayed. This is the case when the company name has changed,
   // or the business name has changed during an alteration, firm change, or special resolution filing,
diff --git a/src/components/common/YourCompany/FolioInformation.vue b/src/components/common/YourCompany/FolioInformation.vue
index 6500a68cc..da0cf11f5 100644
--- a/src/components/common/YourCompany/FolioInformation.vue
+++ b/src/components/common/YourCompany/FolioInformation.vue
@@ -21,7 +21,7 @@
 <script lang="ts">
 import { Component, Mixins, Watch } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { ActionBindingIF, EntitySnapshotIF, FlagsCompanyInfoIF } from '@/interfaces/'
+import { ActionKvIF, EntitySnapshotIF, FlagsCompanyInfoIF } from '@/interfaces/'
 import { AuthServices } from '@/services/'
 import { CommonMixin } from '@/mixins/'
 import { FolioNumber as FolioNumberShared } from '@bcrs-shared-components/folio-number/'
@@ -49,9 +49,9 @@ export default class FolioInformation extends Mixins(CommonMixin) {
   @Getter(useStore) isSpecialResolutionFiling!: boolean
 
   // Global setters
-  @Action(useStore) setFolioNumber!: ActionBindingIF
-  @Action(useStore) setTransactionalFolioNumber!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setFolioNumber!: (x: string) => void
+  @Action(useStore) setTransactionalFolioNumber!: (x: string) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // local properties
   protected isEditingFolioNumber = false
diff --git a/src/components/common/YourCompany/NameTranslations/NameTranslation.vue b/src/components/common/YourCompany/NameTranslations/NameTranslation.vue
index d27a2df40..ec4c7b492 100644
--- a/src/components/common/YourCompany/NameTranslations/NameTranslation.vue
+++ b/src/components/common/YourCompany/NameTranslations/NameTranslation.vue
@@ -207,7 +207,7 @@ import { Action, Getter } from 'pinia-class'
 import { ActionChip as ActionChipShared } from '@bcrs-shared-components/action-chip/'
 import { ConfirmDialog as ConfirmDialogShared } from '@bcrs-shared-components/confirm-dialog/'
 import { ListNameTranslation, AddNameTranslation } from './'
-import { ActionBindingIF, ConfirmDialogType, NameTranslationIF, FlagsCompanyInfoIF } from '@/interfaces/'
+import { ActionKvIF, ConfirmDialogType, NameTranslationIF, FlagsCompanyInfoIF } from '@/interfaces/'
 import { ActionTypes } from '@/enums/'
 import { CommonMixin } from '@/mixins/'
 import { useStore } from '@/store/store'
@@ -238,9 +238,9 @@ export default class NameTranslation extends Mixins(CommonMixin) {
   @Getter(useStore) isLimitedRestorationToFull!: boolean
 
   // Global actions
-  @Action(useStore) setEditingNameTranslations!: ActionBindingIF
-  @Action(useStore) setNameTranslations!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setEditingNameTranslations!: (x: boolean) => void
+  @Action(useStore) setNameTranslations!: (x: NameTranslationIF[]) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // declaration for template
   readonly ActionTypes = ActionTypes
diff --git a/src/components/common/YourCompany/NatureOfBusiness.vue b/src/components/common/YourCompany/NatureOfBusiness.vue
index 21f6635be..99bcd209b 100644
--- a/src/components/common/YourCompany/NatureOfBusiness.vue
+++ b/src/components/common/YourCompany/NatureOfBusiness.vue
@@ -22,7 +22,7 @@
 import { Component, Mixins } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { NaicsServices } from '@/services/'
-import { ActionBindingIF, FlagsCompanyInfoIF } from '@/interfaces/'
+import { ActionKvIF, FlagsCompanyInfoIF } from '@/interfaces/'
 import { NaicsIF } from '@bcrs-shared-components/interfaces/'
 import { NatureOfBusiness as NatureOfBusinessShared } from '@bcrs-shared-components/nature-of-business/'
 import { CommonMixin } from '@/mixins'
@@ -44,8 +44,8 @@ export default class NatureOfBusiness extends Mixins(CommonMixin) {
   @Getter(useStore) hasNaicsChanged!: boolean
   @Getter(useStore) getSnapshotNaics!: NaicsIF
 
-  @Action(useStore) setNaics!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setNaics!: (x: NaicsIF) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   /** The section validity state (when prompted by app). */
   get invalidSection (): boolean {
diff --git a/src/components/common/YourCompany/OfficeAddresses.vue b/src/components/common/YourCompany/OfficeAddresses.vue
index dda458748..c7179f244 100644
--- a/src/components/common/YourCompany/OfficeAddresses.vue
+++ b/src/components/common/YourCompany/OfficeAddresses.vue
@@ -576,7 +576,7 @@ import { Action, Getter } from 'pinia-class'
 import { isEmpty, isEqual } from 'lodash'
 import { DefaultAddressSchema, InBcCanadaAddressSchema } from '@/schemas/'
 import BaseAddress from 'sbc-common-components/src/components/BaseAddress.vue'
-import { ActionBindingIF, AddressIF, AddressesIF, FlagsCompanyInfoIF, ResourceIF } from '@/interfaces/'
+import { ActionKvIF, AddressIF, AddressesIF, FlagsCompanyInfoIF, ResourceIF } from '@/interfaces/'
 import { IsSame } from '@/utils/'
 import { AddressTypes } from '@/enums/'
 import { CommonMixin } from '@/mixins/'
@@ -629,9 +629,9 @@ export default class OfficeAddresses extends Mixins(CommonMixin) {
   @Getter(useStore) isSpecialResolutionFiling!: boolean
 
   // Global actions
-  @Action(useStore) setEditingOfficeAddresses!: ActionBindingIF
-  @Action(useStore) setOfficeAddresses!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setEditingOfficeAddresses!: (x: boolean) => void
+  @Action(useStore) setOfficeAddresses!: (x: AddressesIF) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   // Declarations for template
   readonly isEmpty = isEmpty
diff --git a/src/dialogs/ResolutionDateDialog.vue b/src/dialogs/ResolutionDateDialog.vue
index 37601a7f9..2d972f3d8 100644
--- a/src/dialogs/ResolutionDateDialog.vue
+++ b/src/dialogs/ResolutionDateDialog.vue
@@ -60,7 +60,6 @@ import { Component, Emit, Mixins, Prop } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { DatePicker as DatePickerShared } from '@bcrs-shared-components/date-picker/'
 import { cloneDeep } from 'lodash'
-import { ActionBindingIF } from '@/interfaces/'
 import { DateMixin } from '@/mixins/'
 import { useStore } from '@/store/store'
 
@@ -82,7 +81,7 @@ export default class ResolutionDateDialog extends Mixins(DateMixin) {
   @Getter(useStore) getNewResolutionDates!: string []
 
   // Global action
-  @Action(useStore) setNewResolutionDates!: ActionBindingIF
+  @Action(useStore) setNewResolutionDates!: (x: string[]) => void
 
   // Local properties
   private date = ''
diff --git a/src/interfaces/alteration-interfaces/alteration-interface.ts b/src/interfaces/alteration-interfaces/alteration-interface.ts
index 9616b3e9f..32d7e1bd0 100644
--- a/src/interfaces/alteration-interfaces/alteration-interface.ts
+++ b/src/interfaces/alteration-interfaces/alteration-interface.ts
@@ -2,7 +2,7 @@ import { CourtOrderIF, NameRequestIF, NameTranslationIF, ShareStructureIF }
   from '@/interfaces/'
 import { CoopTypes } from '@/enums'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces/'
-import { CorpTypeCd } from '@bcrs-shared-components/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 
 //
 // Ref: https://github.com/bcgov/business-schemas/blob/main/src/registry_schemas/schemas/alteration.json
diff --git a/src/interfaces/restoration-interfaces/restoration-interface.ts b/src/interfaces/restoration-interfaces/restoration-interface.ts
index b97a74367..d38c334ed 100644
--- a/src/interfaces/restoration-interfaces/restoration-interface.ts
+++ b/src/interfaces/restoration-interfaces/restoration-interface.ts
@@ -1,6 +1,6 @@
 import { ApprovalTypes, RestorationTypes, RelationshipTypes } from '@/enums'
 import { AddressesIF, CourtOrderIF, NameRequestIF, NameTranslationIF, OrgPersonIF } from '@/interfaces/'
-import { CorpTypeCd } from '@bcrs-shared-components/enums'
+import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { ContactPointIF } from '@bcrs-shared-components/interfaces/'
 
 //
diff --git a/src/interfaces/store-interfaces/action-interface.ts b/src/interfaces/store-interfaces/action-interface.ts
index d40e6e8bb..009b910aa 100644
--- a/src/interfaces/store-interfaces/action-interface.ts
+++ b/src/interfaces/store-interfaces/action-interface.ts
@@ -1,14 +1,3 @@
-import { ActionContext } from 'vuex'
-
-// Interface to define a Vuex Action
-export interface ActionIF {
-  (x: ActionContext<string, any>, y: any): void
-}
-
-export interface ActionBindingIF {
-  (x?: any): void
-}
-
 export interface ActionKvIF {
   key: string,
   value: any
diff --git a/src/interfaces/store-interfaces/state-interfaces/name-request-interface.ts b/src/interfaces/store-interfaces/state-interfaces/name-request-interface.ts
index d9da0b80f..a239a52d7 100644
--- a/src/interfaces/store-interfaces/state-interfaces/name-request-interface.ts
+++ b/src/interfaces/store-interfaces/state-interfaces/name-request-interface.ts
@@ -34,7 +34,7 @@ export interface NameRequestIF {
   details?: NameRequestDetailsIF
   expiry?: string
   filingId?: number
-  legalName: string
+  legalName?: string
   legalType: CorpTypeCd
   nrNumber?: string
   requestType?: NrRequestActionCodes
diff --git a/src/mixins/fee-mixin.ts b/src/mixins/fee-mixin.ts
index 250f62c99..e93a89d82 100644
--- a/src/mixins/fee-mixin.ts
+++ b/src/mixins/fee-mixin.ts
@@ -1,7 +1,7 @@
 import Vue from 'vue'
 import { Component } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
-import { ActionBindingIF, EmptyFees, FeesIF } from '@/interfaces'
+import { EmptyFees, FeesIF } from '@/interfaces'
 import { PayServices } from '@/services/'
 import { StaffPaymentOptions } from '@bcrs-shared-components/enums'
 import { FilingDataIF, StaffPaymentIF } from '@bcrs-shared-components/interfaces'
@@ -19,9 +19,9 @@ export default class FeeMixin extends Vue {
   @Getter(useStore) getStaffPayment!: StaffPaymentIF
 
   // Global actions
-  @Action(useStore) setCurrentFees!: ActionBindingIF
-  @Action(useStore) setFeePrices!: ActionBindingIF
-  @Action(useStore) setFilingData!: ActionBindingIF
+  @Action(useStore) setCurrentFees!: (x: FeesIF[]) => void
+  @Action(useStore) setFeePrices!: (x: FeesIF[]) => void
+  @Action(useStore) setFilingData!: (x: FilingDataIF[]) => void
 
   /** Provides the filing fees price. */
   get filingFeesPrice (): string {
diff --git a/src/mixins/filing-template-mixin.ts b/src/mixins/filing-template-mixin.ts
index 6733624ef..d9f3f7ae9 100644
--- a/src/mixins/filing-template-mixin.ts
+++ b/src/mixins/filing-template-mixin.ts
@@ -2,14 +2,14 @@ import { Component } from 'vue-property-decorator'
 import { Action, Getter } from 'pinia-class'
 import { cloneDeep } from 'lodash'
 import { DateMixin } from '@/mixins/'
-import { ActionBindingIF, AddressesIF, AlterationFilingIF, CertifyIF, CoopAlterationIF, CorrectionInformationIF,
-  CorrectionFilingIF, EffectiveDateTimeIF, EntitySnapshotIF, ChgRegistrationFilingIF, ConversionFilingIF,
+import { AddressesIF, AlterationFilingIF, BusinessInformationIF, CertifyIF, CoopAlterationIF, CorrectionInformationIF,
+  CorrectionFilingIF, CourtOrderIF, EffectiveDateTimeIF, EntitySnapshotIF, ChgRegistrationFilingIF, ConversionFilingIF,
   NameRequestIF, NameTranslationIF, OrgPersonIF, RestorationFilingIF, RestorationStateIF,
   SpecialResolutionFilingIF, StateFilingRestorationIF, RulesMemorandumIF } from '@/interfaces/'
 import { CompletingPartyIF, ContactPointIF, NaicsIF, ShareClassIF, SpecialResolutionIF,
   StaffPaymentIF } from '@bcrs-shared-components/interfaces/'
-import { ActionTypes, CoopTypes, CorrectionErrorTypes, EffectOfOrders, FilingTypes, PartyTypes,
-  RoleTypes } from '@/enums/'
+import { ActionTypes, ApprovalTypes, CoopTypes, CorrectionErrorTypes, EffectOfOrders, FilingTypes, PartyTypes,
+  RelationshipTypes, RestorationTypes, RoleTypes } from '@/enums/'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { StaffPaymentOptions } from '@bcrs-shared-components/enums/'
 import { FilingTypeToName } from '@/utils'
@@ -80,38 +80,38 @@ export default class FilingTemplateMixin extends DateMixin {
   @Getter(useStore) hasSpecialResolutionResolutionChanged!: boolean
 
   // Global actions
-  @Action(useStore) setBusinessContact!: ActionBindingIF
-  @Action(useStore) setBusinessInformation!: ActionBindingIF
-  @Action(useStore) setCertifyState!: ActionBindingIF
-  @Action(useStore) setCorrectionInformation!: ActionBindingIF
-  @Action(useStore) setEntityType!: ActionBindingIF
-  @Action(useStore) setOfficeAddresses!: ActionBindingIF
-  @Action(useStore) setNaics!: ActionBindingIF
-  @Action(useStore) setNameTranslations!: ActionBindingIF
-  @Action(useStore) setNameRequest!: ActionBindingIF
-  @Action(useStore) setPeopleAndRoles!: ActionBindingIF
-  @Action(useStore) setShareClasses!: ActionBindingIF
-  @Action(useStore) setEffectiveDateTimeString!: ActionBindingIF
-  @Action(useStore) setIsFutureEffective!: ActionBindingIF
-  @Action(useStore) setFolioNumber!: ActionBindingIF
-  @Action(useStore) setTransactionalFolioNumber!: ActionBindingIF
-  @Action(useStore) setStaffPayment!: ActionBindingIF
-  @Action(useStore) setDetailComment!: ActionBindingIF
-  @Action(useStore) setEntitySnapshot!: ActionBindingIF
-  @Action(useStore) setDocumentOptionalEmail!: ActionBindingIF
-  @Action(useStore) setProvisionsRemoved!: ActionBindingIF
-  @Action(useStore) setNewResolutionDates!: ActionBindingIF
-  @Action(useStore) setFileNumber!: ActionBindingIF
-  @Action(useStore) setHasPlanOfArrangement!: ActionBindingIF
-  @Action(useStore) setSpecialResolution!: ActionBindingIF
-  @Action(useStore) setCorrectionStartDate!: ActionBindingIF
-  @Action(useStore) setRestorationApprovalType!: ActionBindingIF
-  @Action(useStore) setRestorationCourtOrder!: ActionBindingIF
-  @Action(useStore) setRestorationExpiryDate!: ActionBindingIF
-  @Action(useStore) setRestorationType!: ActionBindingIF
-  @Action(useStore) setRestorationRelationships!: ActionBindingIF
-  @Action(useStore) setSpecialResolutionMemorandum!: ActionBindingIF
-  @Action(useStore) setSpecialResolutionRules!: ActionBindingIF
+  @Action(useStore) setBusinessContact!: (x: ContactPointIF) => void
+  @Action(useStore) setBusinessInformation!: (x: BusinessInformationIF) => void
+  @Action(useStore) setCertifyState!: (x: CertifyIF) => void
+  @Action(useStore) setCorrectionInformation!: (x: CorrectionInformationIF) => void
+  @Action(useStore) setEntityType!: (x: CorpTypeCd) => void
+  @Action(useStore) setOfficeAddresses!: (x: AddressesIF) => void
+  @Action(useStore) setNaics!: (x: NaicsIF) => void
+  @Action(useStore) setNameTranslations!: (x: NameTranslationIF[]) => void
+  @Action(useStore) setNameRequest!: (x: NameRequestIF) => void
+  @Action(useStore) setPeopleAndRoles!: (x: OrgPersonIF[]) => void
+  @Action(useStore) setShareClasses!: (x: ShareClassIF[]) => void
+  @Action(useStore) setEffectiveDateTimeString!: (x: string) => void
+  @Action(useStore) setIsFutureEffective!: (x: boolean) => void
+  @Action(useStore) setFolioNumber!: (x: string) => void
+  @Action(useStore) setTransactionalFolioNumber!: (x: string) => void
+  @Action(useStore) setStaffPayment!: (x: StaffPaymentIF) => void
+  @Action(useStore) setDetailComment!: (x: string) => void
+  @Action(useStore) setEntitySnapshot!: (x: EntitySnapshotIF) => void
+  @Action(useStore) setDocumentOptionalEmail!: (x: string) => void
+  @Action(useStore) setProvisionsRemoved!: (x: boolean) => void
+  @Action(useStore) setNewResolutionDates!: (x: string[]) => void
+  @Action(useStore) setFileNumber!: (x: string) => void
+  @Action(useStore) setHasPlanOfArrangement!: (x: boolean) => void
+  @Action(useStore) setSpecialResolution!: (x: SpecialResolutionIF) => void
+  @Action(useStore) setCorrectionStartDate!: (x: string) => void
+  @Action(useStore) setRestorationApprovalType!: (x: ApprovalTypes) => void
+  @Action(useStore) setRestorationCourtOrder!: (x: CourtOrderIF) => void
+  @Action(useStore) setRestorationExpiryDate!: (x: string) => void
+  @Action(useStore) setRestorationType!: (x: RestorationTypes) => void
+  @Action(useStore) setRestorationRelationships!: (x: RelationshipTypes[]) => void
+  @Action(useStore) setSpecialResolutionMemorandum!: (x: RulesMemorandumIF) => void
+  @Action(useStore) setSpecialResolutionRules!: (x: RulesMemorandumIF) => void
 
   /** The default (hard-coded first line) correction detail comment. */
   public get defaultCorrectionDetailComment (): string {
diff --git a/src/store/store.ts b/src/store/store.ts
index b3f0d14fb..a18df34fb 100644
--- a/src/store/store.ts
+++ b/src/store/store.ts
@@ -14,10 +14,13 @@ import {
 } from '@/enums/'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import {
+  ActionKvIF,
+  AccountInformationIF,
   AddressesIF,
   BusinessInformationIF,
   CertifyIF,
   CorrectionInformationIF,
+  CourtOrderIF,
   EffectiveDateTimeIF,
   EntitySnapshotIF,
   FeesIF,
@@ -33,9 +36,7 @@ import {
   ShareClassIF,
   StateIF,
   StateFilingRestorationIF,
-  ValidationFlagsIF,
-  ActionKvIF,
-  CourtOrderIF } from '@/interfaces/'
+  ValidationFlagsIF } from '@/interfaces/'
 import {
   CompletingPartyIF,
   ContactPointIF,
@@ -1306,25 +1307,25 @@ export const useStore = defineStore('store', {
     setEntityTypeChangedByName (entityTypeChangedByName: boolean) {
       this.stateModel.tombstone.entityTypeChangedByName = entityTypeChangedByName
     },
-    setBusinessId (businessId) {
+    setBusinessId (businessId: string) {
       this.stateModel.tombstone.businessId = businessId
     },
-    setIsSaving (isSaving) {
+    setIsSaving (isSaving: boolean) {
       this.stateModel.tombstone.isSaving = isSaving
     },
-    setIsSavingResuming (isSavingResuming) {
+    setIsSavingResuming (isSavingResuming: boolean) {
       this.stateModel.tombstone.isSavingResuming = isSavingResuming
     },
-    setIsFilingPaying (isFilingPaying) {
+    setIsFilingPaying (isFilingPaying: boolean) {
       this.stateModel.tombstone.isFilingPaying = isFilingPaying
     },
-    setKeycloakRoles (keycloakRoles) {
+    setKeycloakRoles (keycloakRoles: string[]) {
       this.stateModel.tombstone.keycloakRoles = keycloakRoles
     },
-    setUserInfo (userInfo) {
+    setUserInfo (userInfo: any) {
       this.stateModel.tombstone.userInfo = userInfo
     },
-    setOrgInfo (orgInfo) {
+    setOrgInfo (orgInfo: any) {
       this.stateModel.tombstone.orgInfo = orgInfo
     },
     setCurrentDate (dateString: string) {
@@ -1351,14 +1352,14 @@ export const useStore = defineStore('store', {
       this.stateModel.certifyState = certifyState
       if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
     },
-    setCertifyStateValidity (validity) {
+    setCertifyStateValidity (validity: boolean) {
       this.stateModel.validationFlags.flagsReviewCertify.isValidCertify = validity
     },
     setDocumentOptionalEmail (documentOptionalEmail: string) {
       this.stateModel.documentDelivery.documentOptionalEmail = documentOptionalEmail
       if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
     },
-    setDocumentOptionalEmailValidity (validity) {
+    setDocumentOptionalEmailValidity (validity: boolean) {
       this.stateModel.validationFlags.flagsReviewCertify.isValidDocumentOptionalEmail = validity
     },
     setCompletingParty (cp: CompletingPartyIF) {
@@ -1372,7 +1373,7 @@ export const useStore = defineStore('store', {
       this.stateModel.tombstone.transactionalFolioNumber = folioNumber
       if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
     },
-    setTransactionalFolioNumberValidity (validity) {
+    setTransactionalFolioNumberValidity (validity: boolean) {
       this.stateModel.validationFlags.flagsReviewCertify.isValidTransactionalFolioNumber = validity
     },
     setBusinessContact (businessContact: ContactPointIF) {
@@ -1387,7 +1388,7 @@ export const useStore = defineStore('store', {
       this.stateModel.tombstone.folioNumber = folioNumber
       // NB: folio number was changed immediately in auth db - do not set unsaved Changes flag
     },
-    setAccountInformation (accountInformation) {
+    setAccountInformation (accountInformation: AccountInformationIF) {
       this.stateModel.accountInformation = accountInformation
     },
     setBusinessInformation (businessInformation: BusinessInformationIF) {
@@ -1442,7 +1443,7 @@ export const useStore = defineStore('store', {
     setEntitySnapshot (entitySnapshot: EntitySnapshotIF) {
       this.stateModel.entitySnapshot = entitySnapshot
     },
-    setStaffPayment (staffPayment) {
+    setStaffPayment (staffPayment: StaffPaymentIF) {
       this.stateModel.staffPayment = staffPayment
       if (!this.stateModel.tombstone.ignoreChanges) this.stateModel.tombstone.haveUnsavedChanges = true
     },
diff --git a/src/views/Alteration.vue b/src/views/Alteration.vue
index cb6aaf717..ac4772287 100644
--- a/src/views/Alteration.vue
+++ b/src/views/Alteration.vue
@@ -135,7 +135,7 @@ import { BusinessContactInfo, BusinessType, CertifySection, CourtOrderPoa, Curre
 import { NameTranslation } from '@/components/common/YourCompany/NameTranslations/'
 import { AuthServices, LegalServices } from '@/services/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
-import { ActionBindingIF, EntitySnapshotIF, FilingDataIF, ResourceIF } from '@/interfaces/'
+import { EntitySnapshotIF, FilingDataIF, ResourceIF } from '@/interfaces/'
 import { FilingStatus } from '@/enums/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
 import { BcAlterationResource, BenAlterationResource, CccAlterationResource, UlcAlterationResource }
@@ -181,10 +181,10 @@ export default class Alteration extends Mixins(CommonMixin, FeeMixin, FilingTemp
   @Getter(useStore) showFeeSummary!: boolean
 
   // Global actions
-  @Action(useStore) setDocumentOptionalEmailValidity!: ActionBindingIF
-  @Action(useStore) setFilingId!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setResource!: ActionBindingIF
+  @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
+  @Action(useStore) setFilingId!: (x: number) => void
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setResource!: (x: ResourceIF) => void
 
   /** Whether App is ready. */
   @Prop({ default: false }) readonly appReady!: boolean
diff --git a/src/views/Change.vue b/src/views/Change.vue
index c11de2125..4333638a4 100644
--- a/src/views/Change.vue
+++ b/src/views/Change.vue
@@ -107,7 +107,7 @@ import { BusinessContactInfo, BusinessStartDate, BusinessType, CertifySection, C
   TransactionalFolioNumber, YourCompanyWrapper } from '@/components/common/'
 import { AuthServices, LegalServices } from '@/services/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
-import { ActionBindingIF, EntitySnapshotIF, ResourceIF } from '@/interfaces/'
+import { EntitySnapshotIF, ResourceIF } from '@/interfaces/'
 import { FilingStatus, PartyTypes } from '@/enums/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
 import { SpChangeResource, GpChangeResource, SpOrganizationChangeResource } from '@/resources/Change/'
@@ -149,10 +149,10 @@ export default class Change extends Mixins(CommonMixin, FeeMixin, FilingTemplate
   @Getter(useStore) showFeeSummary!: boolean
 
   // Global actions
-  @Action(useStore) setDocumentOptionalEmailValidity!: ActionBindingIF
-  @Action(useStore) setFilingId!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setResource!: ActionBindingIF
+  @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
+  @Action(useStore) setFilingId!: (x: number) => void
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setResource!: (x: ResourceIF) => void
 
   /** Whether App is ready. */
   @Prop({ default: false }) readonly appReady!: boolean
diff --git a/src/views/Conversion.vue b/src/views/Conversion.vue
index 59b53d009..9df1df43d 100644
--- a/src/views/Conversion.vue
+++ b/src/views/Conversion.vue
@@ -70,7 +70,7 @@ import { CompletingParty, BusinessStartDate, BusinessType, EntityName, FolioInfo
   PeopleAndRoles, YourCompanyWrapper } from '@/components/common/'
 import { AuthServices, LegalServices } from '@/services/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
-import { ActionBindingIF, EntitySnapshotIF } from '@/interfaces/'
+import { EntitySnapshotIF, ResourceIF } from '@/interfaces/'
 import { FilingStatus } from '@/enums/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
 import { SpConversionResource, GpConversionResource } from '@/resources/Conversion/'
@@ -104,10 +104,10 @@ export default class Conversion extends Mixins(CommonMixin, FeeMixin, FilingTemp
   @Getter(useStore) showFeeSummary!: boolean
 
   // Global actions
-  @Action(useStore) setCertifyStateValidity!: ActionBindingIF
-  @Action(useStore) setFilingId!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setResource!: ActionBindingIF
+  @Action(useStore) setCertifyStateValidity!: (x: boolean) => void
+  @Action(useStore) setFilingId!: (x: number) => void
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setResource!: (x: ResourceIF) => void
 
   /** Whether App is ready. */
   @Prop({ default: false }) readonly appReady!: boolean
diff --git a/src/views/Correction.vue b/src/views/Correction.vue
index 12c57e7d0..afd553817 100644
--- a/src/views/Correction.vue
+++ b/src/views/Correction.vue
@@ -15,7 +15,7 @@ import { Action, Getter } from 'pinia-class'
 import { GetFeatureFlag } from '@/utils/'
 import { CommonMixin } from '@/mixins/'
 import { LegalServices } from '@/services/'
-import { ActionBindingIF, CorrectionFilingIF } from '@/interfaces/'
+import { CorrectionFilingIF } from '@/interfaces/'
 import { FilingStatus, FilingTypes } from '@/enums/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
@@ -46,8 +46,8 @@ export default class Correction extends Mixins(CommonMixin) {
   @Getter(useStore) isFirm!: boolean
 
   // Global actions
-  @Action(useStore) setFilingId!: ActionBindingIF
-  @Action(useStore) setEntityType!: ActionBindingIF
+  @Action(useStore) setFilingId!: (x: number) => void
+  @Action(useStore) setEntityType!: (x: CorpTypeCd) => void
 
   correctionFiling = null as CorrectionFilingIF
 
diff --git a/src/views/Correction/CoopCorrection.vue b/src/views/Correction/CoopCorrection.vue
index 20ebb41e6..16d4c4f04 100644
--- a/src/views/Correction/CoopCorrection.vue
+++ b/src/views/Correction/CoopCorrection.vue
@@ -80,7 +80,7 @@ import Rules from '@/components/SpecialResolution/Rules.vue'
 import Memorandum from '@/components/SpecialResolution/Memorandum.vue'
 import { Action, Getter } from 'pinia-class'
 import { useStore } from '@/store/store'
-import { ActionBindingIF, CorrectionFilingIF, ResourceIF, EntitySnapshotIF } from '@/interfaces'
+import { CorrectionFilingIF, ResourceIF, EntitySnapshotIF } from '@/interfaces'
 import { CpCorrectionResource } from '@/resources/Correction'
 import { LegalServices, AuthServices } from '@/services'
 import { StaffPaymentOptions } from '@bcrs-shared-components/enums'
@@ -117,9 +117,8 @@ export default class CoopCorrection extends Mixins(CommonMixin, DateMixin, FeeMi
   @Getter(useStore) isSoleProp!: boolean
 
   // Global actions
-  @Action(useStore) setCertifyStatementResource!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setResource!: ActionBindingIF
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setResource!: (x: ResourceIF) => void
 
   /** The draft correction filing to process. */
   @Prop({ default: () => null }) readonly correctionFiling!: CorrectionFilingIF
diff --git a/src/views/Correction/CorpCorrection.vue b/src/views/Correction/CorpCorrection.vue
index 7d5ffc534..c8cac653a 100644
--- a/src/views/Correction/CorpCorrection.vue
+++ b/src/views/Correction/CorpCorrection.vue
@@ -81,7 +81,7 @@ import { BusinessContactInfo, CertifySection, CompletingParty, Detail, EntityNam
 import { CommonMixin, DateMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
 import { AuthServices, LegalServices } from '@/services/'
 import { StaffPaymentOptions } from '@bcrs-shared-components/enums/'
-import { ActionBindingIF, CorrectionFilingIF, EntitySnapshotIF, ResourceIF } from '@/interfaces/'
+import { CorrectionFilingIF, EntitySnapshotIF, ResourceIF } from '@/interfaces/'
 import { BcCorrectionResource, BenCorrectionResource, CccCorrectionResource, UlcCorrectionResource }
   from '@/resources/Correction/'
 import { useStore } from '@/store/store'
@@ -113,9 +113,8 @@ export default class CorpCorrection extends Mixins(CommonMixin, DateMixin, FeeMi
   @Getter(useStore) isBenefitCompany!: boolean
 
   // Global actions
-  @Action(useStore) setCertifyStatementResource!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setResource!: ActionBindingIF
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setResource!: (x: ResourceIF) => void
 
   /** The draft correction filing to process. */
   @Prop({ default: () => null }) readonly correctionFiling!: CorrectionFilingIF
diff --git a/src/views/Correction/FirmCorrection.vue b/src/views/Correction/FirmCorrection.vue
index feb8ed82a..7297d5371 100644
--- a/src/views/Correction/FirmCorrection.vue
+++ b/src/views/Correction/FirmCorrection.vue
@@ -54,7 +54,7 @@ import { BusinessContactInfo, BusinessStartDate, BusinessType, CertifySection, C
   EntityName, NatureOfBusiness, OfficeAddresses, PeopleAndRoles, StaffPayment, YourCompanyWrapper }
   from '@/components/common/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
-import { ActionBindingIF, CorrectionFilingIF, EntitySnapshotIF, ResourceIF }
+import { CorrectionFilingIF, EntitySnapshotIF, ResourceIF }
   from '@/interfaces/'
 import { AuthServices, LegalServices } from '@/services/'
 import { StaffPaymentOptions } from '@bcrs-shared-components/enums/'
@@ -84,9 +84,8 @@ export default class FirmCorrection extends Mixins(CommonMixin, FeeMixin, Filing
   @Getter(useStore) isSoleProp!: boolean
 
   // Global actions
-  @Action(useStore) setCertifyStatementResource!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setResource!: ActionBindingIF
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setResource!: (x: ResourceIF) => void
 
   /** The draft correction filing to process. */
   @Prop({ default: () => null }) readonly correctionFiling!: CorrectionFilingIF
diff --git a/src/views/LimitedRestorationExtension.vue b/src/views/LimitedRestorationExtension.vue
index 8b5dfff9c..5ce4dee32 100644
--- a/src/views/LimitedRestorationExtension.vue
+++ b/src/views/LimitedRestorationExtension.vue
@@ -121,7 +121,7 @@ import { BusinessContactInfo, CertifySection, DocumentsDelivery, EntityName, Fol
   ListPeopleAndRoles, NameTranslation, OfficeAddresses, PeopleAndRoles, QuestionWrapper,
   RecognitionDateTime, StaffPayment, YourCompanyWrapper } from '@/components/common/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin, OrgPersonMixin } from '@/mixins/'
-import { ActionBindingIF, EntitySnapshotIF, OrgPersonIF, ResourceIF, RestorationFilingIF }
+import { EntitySnapshotIF, OrgPersonIF, ResourceIF, RestorationFilingIF }
   from '@/interfaces/'
 import { FilingStatus, RoleTypes } from '@/enums/'
 import { BcRestorationResource, BenRestorationResource, CccRestorationResource, UlcRestorationResource }
@@ -172,11 +172,11 @@ export default class LimitedRestorationExtension extends Mixins(
   @Getter(useStore) showFeeSummary!: boolean
 
   // Global actions
-  @Action(useStore) setDocumentOptionalEmailValidity!: ActionBindingIF
-  @Action(useStore) setFilingId!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setResource!: ActionBindingIF
-  @Action(useStore) setStateFilingRestoration!: ActionBindingIF
+  @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
+  @Action(useStore) setFilingId!: (x: number) => void
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setResource!: (x: ResourceIF) => void
+  @Action(useStore) setStateFilingRestoration!: (x: Promise<any>) => void
 
   /** Whether App is ready. */
   @Prop({ default: false }) readonly appReady!: boolean
diff --git a/src/views/LimitedRestorationToFull.vue b/src/views/LimitedRestorationToFull.vue
index 486c05f67..71daaab83 100644
--- a/src/views/LimitedRestorationToFull.vue
+++ b/src/views/LimitedRestorationToFull.vue
@@ -144,7 +144,7 @@ import { BusinessContactInfo, CertifySection, CourtOrderPoa, DocumentsDelivery,
 import { AuthServices, LegalServices } from '@/services/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin, OrgPersonMixin } from '@/mixins/'
 import {
-  ActionBindingIF,
+  ActionKvIF,
   EntitySnapshotIF,
   OrgPersonIF,
   ResourceIF,
@@ -206,12 +206,12 @@ export default class LimitedRestorationToFull extends Mixins(
   @Getter(useStore) showFeeSummary!: boolean
 
   // Global actions
-  @Action(useStore) setDocumentOptionalEmailValidity!: ActionBindingIF
-  @Action(useStore) setFilingId!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setResource!: ActionBindingIF
-  @Action(useStore) setStateFilingRestoration!: ActionBindingIF
-  @Action(useStore) setValidComponent!: ActionBindingIF
+  @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
+  @Action(useStore) setFilingId!: (x: number) => void
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setResource!: (x: ResourceIF) => void
+  @Action(useStore) setStateFilingRestoration!: (x: Promise<any>) => void
+  @Action(useStore) setValidComponent!: (x: ActionKvIF) => void
 
   /** Whether App is ready. */
   @Prop({ default: false }) readonly appReady!: boolean
diff --git a/src/views/SpecialResolution.vue b/src/views/SpecialResolution.vue
index aa709e5f3..0a552744e 100644
--- a/src/views/SpecialResolution.vue
+++ b/src/views/SpecialResolution.vue
@@ -148,7 +148,7 @@ import { AssociationType, BusinessContactInfo, BusinessType, CertifySection, Com
   YourCompanyWrapper } from '@/components/common/'
 import { AuthServices, LegalServices } from '@/services/'
 import { CommonMixin, FeeMixin, FilingTemplateMixin } from '@/mixins/'
-import { ActionBindingIF, EntitySnapshotIF, FilingDataIF, ResourceIF } from '@/interfaces/'
+import { EntitySnapshotIF, FilingDataIF, ResourceIF } from '@/interfaces/'
 import { CorpTypeCd } from '@bcrs-shared-components/corp-type-module/'
 import { FilingCodes, FilingStatus } from '@/enums/'
 import { SessionStorageKeys } from 'sbc-common-components/src/util/constants'
@@ -192,10 +192,10 @@ export default class SpecialResolution extends Mixins(CommonMixin, FeeMixin, Fil
   @Getter(useStore) showFeeSummary!: boolean
 
   // Global actions
-  @Action(useStore) setDocumentOptionalEmailValidity!: ActionBindingIF
-  @Action(useStore) setFilingId!: ActionBindingIF
-  @Action(useStore) setHaveUnsavedChanges!: ActionBindingIF
-  @Action(useStore) setResource!: ActionBindingIF
+  @Action(useStore) setDocumentOptionalEmailValidity!: (x: boolean) => void
+  @Action(useStore) setFilingId!: (x: number) => void
+  @Action(useStore) setHaveUnsavedChanges!: (x: boolean) => void
+  @Action(useStore) setResource!: (x: ResourceIF) => void
 
   /** Whether App is ready. */
   @Prop({ default: false }) readonly appReady!: boolean