diff --git a/dev/generator/src/issues.ts b/dev/generator/src/issues.ts
index ec56522f77..686772ebb5 100644
--- a/dev/generator/src/issues.ts
+++ b/dev/generator/src/issues.ts
@@ -49,7 +49,7 @@ export async function generateIssues (
   options: IssueOptions
 ): Promise<void> {
   const connection = await connect(transactorUrl, workspaceId)
-  const accounts = await connection.findAll(contact.class.EmployeeAccount, {})
+  const accounts = await connection.findAll(contact.class.PersonAccount, {})
   const account = faker.random.arrayElement(accounts)
   const client = new TxOperations(connection, account._id)
   const ctx = new MeasureMetricsContext('recruit', {})
diff --git a/dev/generator/src/recruit.ts b/dev/generator/src/recruit.ts
index 866555e532..27e6c398fa 100644
--- a/dev/generator/src/recruit.ts
+++ b/dev/generator/src/recruit.ts
@@ -1,4 +1,4 @@
-import contact, { Channel, Employee, EmployeeAccount, Person } from '@hcengineering/contact'
+import contact, { Channel, PersonAccount, Person, Employee } from '@hcengineering/contact'
 import core, {
   AttachedData,
   Data,
@@ -48,9 +48,9 @@ export async function generateContacts (
 ): Promise<void> {
   const connection = await connect(transactorUrl, workspaceId)
 
-  const accounts = await connection.findAll(contact.class.EmployeeAccount, {})
+  const accounts = await connection.findAll(contact.class.PersonAccount, {})
   const accountIds = accounts.map((a) => a._id)
-  const emoloyeeIds = accounts.map((a) => a.employee)
+  const emoloyeeIds = accounts.map((a) => a.person as Ref<Employee>)
 
   const account = faker.random.arrayElement(accounts)
 
@@ -78,7 +78,7 @@ export async function generateContacts (
 
 async function genVacansyApplicants (
   ctx: MeasureContext,
-  accountIds: Ref<EmployeeAccount>[],
+  accountIds: Ref<PersonAccount>[],
   options: RecruitOptions,
   i: number,
   client: TxOperations,
diff --git a/dev/tool/src/benchmark.ts b/dev/tool/src/benchmark.ts
index 5ee2889bf4..57db3b64e1 100644
--- a/dev/tool/src/benchmark.ts
+++ b/dev/tool/src/benchmark.ts
@@ -207,7 +207,7 @@ export async function benchmark (
           'avg',
           {},
           async () =>
-            await monitorConnection?.findAll(contact.class.Employee, {}).then((res) => {
+            await monitorConnection?.findAll(contact.mixin.Employee, {}).then((res) => {
               const cur = Date.now() - st
               opTime += cur
               moment = cur
diff --git a/dev/tool/src/clean.ts b/dev/tool/src/clean.ts
index bea7d99aeb..6761480548 100644
--- a/dev/tool/src/clean.ts
+++ b/dev/tool/src/clean.ts
@@ -76,7 +76,7 @@ export async function cleanWorkspace (
     if (opt.recruit) {
       const contacts = await ops.findAll(recruit.mixin.Candidate, {})
       console.log('removing Talents', contacts.length)
-      const filter = contacts.filter((it) => !hierarchy.isDerived(it._class, contact.class.Employee))
+      const filter = contacts.filter((it) => !hierarchy.isDerived(it._class, contact.mixin.Employee))
 
       while (filter.length > 0) {
         const part = filter.splice(0, 100)
diff --git a/dev/tool/src/workspace.ts b/dev/tool/src/workspace.ts
index a803e32dbc..ad81664ab9 100644
--- a/dev/tool/src/workspace.ts
+++ b/dev/tool/src/workspace.ts
@@ -33,7 +33,7 @@ export async function diffWorkspace (mongoUrl: string, workspace: WorkspaceId, r
       .find<Tx>({
       objectSpace: core.space.Model,
       modifiedBy: core.account.System,
-      objectClass: { $ne: contact.class.EmployeeAccount }
+      objectClass: { $ne: contact.class.PersonAccount }
     })
       .toArray()
 
@@ -41,7 +41,7 @@ export async function diffWorkspace (mongoUrl: string, workspace: WorkspaceId, r
       return (
         tx.objectSpace === core.space.Model &&
         tx.modifiedBy === core.account.System &&
-        (tx as any).objectClass !== contact.class.EmployeeAccount
+        (tx as any).objectClass !== contact.class.PersonAccount
       )
     })
 
diff --git a/models/board/src/index.ts b/models/board/src/index.ts
index 4d1d65ad52..e807b4e6a0 100644
--- a/models/board/src/index.ts
+++ b/models/board/src/index.ts
@@ -88,10 +88,10 @@ export class TCard extends TTask implements Card {
   @Index(IndexKind.FullText)
     location?: string
 
-  @Prop(TypeRef(contact.class.Employee), board.string.Assignee)
+  @Prop(TypeRef(contact.mixin.Employee), board.string.Assignee)
   declare assignee: Ref<Employee> | null
 
-  @Prop(ArrOf(TypeRef(contact.class.Employee)), board.string.Members)
+  @Prop(ArrOf(TypeRef(contact.mixin.Employee)), board.string.Members)
     members?: Ref<Employee>[]
 
   @Prop(TypeCardCover(), board.string.Cover)
diff --git a/models/calendar/src/migration.ts b/models/calendar/src/migration.ts
index 2a35999fc0..38d63c2182 100644
--- a/models/calendar/src/migration.ts
+++ b/models/calendar/src/migration.ts
@@ -22,7 +22,7 @@ import contact from '@hcengineering/contact'
 
 async function migrateCalendars (tx: TxOperations): Promise<void> {
   const existCalendars = new Set((await tx.findAll(calendar.class.Calendar, {})).map((p) => p._id))
-  const users = await tx.findAll(contact.class.EmployeeAccount, {})
+  const users = await tx.findAll(contact.class.PersonAccount, {})
   for (const user of users) {
     if (!existCalendars.has(`${user._id}_calendar` as Ref<Calendar>)) {
       await tx.createDoc(
diff --git a/models/chunter/src/index.ts b/models/chunter/src/index.ts
index b5e3cf1f22..ebbba234be 100644
--- a/models/chunter/src/index.ts
+++ b/models/chunter/src/index.ts
@@ -27,7 +27,7 @@ import {
   SavedMessages,
   ThreadMessage
 } from '@hcengineering/chunter'
-import contact, { Employee } from '@hcengineering/contact'
+import contact, { Person } from '@hcengineering/contact'
 import type { Account, Class, Doc, Domain, Ref, Space, Timestamp } from '@hcengineering/core'
 import { IndexKind } from '@hcengineering/core'
 import {
@@ -113,8 +113,8 @@ export class TMessage extends TChunterMessage implements Message {
 
   declare attachedToClass: Ref<Class<Space>>
 
-  @Prop(ArrOf(TypeRef(contact.class.Employee)), chunter.string.Replies)
-    replies?: Ref<Employee>[]
+  @Prop(ArrOf(TypeRef(contact.class.Person)), chunter.string.Replies)
+    replies?: Ref<Person>[]
 
   repliesCount?: number
 
diff --git a/models/contact/src/index.ts b/models/contact/src/index.ts
index 029783c146..8da46b602d 100644
--- a/models/contact/src/index.ts
+++ b/models/contact/src/index.ts
@@ -23,7 +23,7 @@ import {
   Contact,
   ContactsTab,
   Employee,
-  EmployeeAccount,
+  PersonAccount,
   GetAvatarUrl,
   Member,
   Organization,
@@ -39,8 +39,11 @@ import {
   Collection,
   Hidden,
   Index,
+  Mixin,
   Model,
   Prop,
+  ReadOnly,
+  TypeBoolean,
   TypeDate,
   TypeRef,
   TypeString,
@@ -153,27 +156,30 @@ export class TStatus extends TAttachedDoc implements Status {
   dueDate!: Timestamp
 }
 
-@Model(contact.class.Employee, contact.class.Person)
+@Mixin(contact.mixin.Employee, contact.class.Person)
 @UX(contact.string.Employee, contact.icon.Person, 'EMP', 'name')
 export class TEmployee extends TPerson implements Employee {
-  active!: boolean
+  @Prop(TypeBoolean(), contact.string.Active)
+  @ReadOnly()
+  @Hidden()
+    active!: boolean
 
   @Prop(Collection(contact.class.Status), contact.string.Status)
+  @Hidden()
     statuses?: number
 
-  mergedTo?: Ref<Employee>
-
   @Prop(TypeString(), contact.string.DisplayName)
+  @Hidden()
     displayName?: string | null
 
   @Prop(TypeString(), contact.string.Position)
+  @Hidden()
     position?: string | null
 }
 
-@Model(contact.class.EmployeeAccount, core.class.Account)
-export class TEmployeeAccount extends TAccount implements EmployeeAccount {
-  employee!: Ref<Employee>
-  mergedTo!: Ref<EmployeeAccount>
+@Model(contact.class.PersonAccount, core.class.Account)
+export class TPersonAccount extends TAccount implements PersonAccount {
+  person!: Ref<Person>
 }
 
 @Model(contact.class.Organizations, core.class.Space)
@@ -201,14 +207,14 @@ export function createModel (builder: Builder): void {
     TOrganization,
     TOrganizations,
     TEmployee,
-    TEmployeeAccount,
+    TPersonAccount,
     TChannel,
     TStatus,
     TMember,
     TContactsTab
   )
 
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.ObjectFactory, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.ObjectFactory, {
     component: contact.component.CreateEmployee
   })
 
@@ -239,7 +245,7 @@ export function createModel (builder: Builder): void {
             icon: contact.icon.Person,
             label: contact.string.Employee,
             componentProps: {
-              _class: contact.class.Employee,
+              _class: contact.mixin.Employee,
               icon: contact.icon.Person,
               label: contact.string.Employee,
               createLabel: contact.string.CreateEmployee,
@@ -253,6 +259,9 @@ export function createModel (builder: Builder): void {
             label: contact.string.Person,
             componentProps: {
               _class: contact.class.Person,
+              baseQuery: {
+                [contact.mixin.Employee]: { $exists: false }
+              },
               icon: contact.icon.Person,
               label: contact.string.Person,
               createLabel: contact.string.CreatePerson,
@@ -337,7 +346,7 @@ export function createModel (builder: Builder): void {
       baseQuery: {
         _class: {
           $in: [contact.class.Person],
-          $nin: [contact.class.Employee]
+          $nin: [contact.mixin.Employee]
         }
       }
     },
@@ -347,7 +356,7 @@ export function createModel (builder: Builder): void {
     view.class.Viewlet,
     core.space.Model,
     {
-      attachTo: contact.class.Employee,
+      attachTo: contact.mixin.Employee,
       descriptor: view.viewlet.Table,
       config: [
         '',
@@ -400,7 +409,7 @@ export function createModel (builder: Builder): void {
     pinned: true
   })
 
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.ObjectEditor, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.ObjectEditor, {
     editor: contact.component.EditEmployee,
     pinned: true
   })
@@ -418,7 +427,7 @@ export function createModel (builder: Builder): void {
     editor: contact.component.Members
   })
 
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.ArrayEditor, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.ArrayEditor, {
     inlineEditor: contact.component.EmployeeArrayEditor
   })
 
@@ -450,7 +459,7 @@ export function createModel (builder: Builder): void {
     inlineEditor: contact.component.PersonEditor
   })
 
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.AttributeEditor, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.AttributeEditor, {
     inlineEditor: contact.component.EmployeeEditor
   })
 
@@ -466,15 +475,15 @@ export function createModel (builder: Builder): void {
     encode: contact.function.GetContactLink
   })
 
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.AttributeFilterPresenter, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.AttributeFilterPresenter, {
     presenter: contact.component.EmployeeFilterValuePresenter
   })
 
   builder.mixin(core.class.Account, core.class.Class, view.mixin.AttributeFilterPresenter, {
-    presenter: contact.component.EmployeeAccountFilterValuePresenter
+    presenter: contact.component.PersonAccountFilterValuePresenter
   })
 
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.AttributeFilter, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.AttributeFilter, {
     component: contact.component.EmployeeFilter
   })
 
@@ -621,15 +630,15 @@ export function createModel (builder: Builder): void {
     inlineEditor: contact.component.AccountArrayEditor
   })
 
-  builder.mixin(contact.class.EmployeeAccount, core.class.Class, view.mixin.ArrayEditor, {
+  builder.mixin(contact.class.PersonAccount, core.class.Class, view.mixin.ArrayEditor, {
     inlineEditor: contact.component.AccountArrayEditor
   })
 
   builder.mixin(core.class.Account, core.class.Class, view.mixin.ObjectPresenter, {
-    presenter: contact.component.EmployeeAccountPresenter
+    presenter: contact.component.PersonAccountPresenter
   })
   builder.mixin(core.class.Account, core.class.Class, view.mixin.AttributePresenter, {
-    presenter: contact.component.EmployeeAccountRefPresenter
+    presenter: contact.component.PersonAccountRefPresenter
   })
 
   builder.mixin(contact.class.Organization, core.class.Class, view.mixin.ObjectPresenter, {
@@ -640,11 +649,11 @@ export function createModel (builder: Builder): void {
     presenter: contact.component.ContactPresenter
   })
 
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.ObjectPresenter, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.ObjectPresenter, {
     presenter: contact.component.EmployeePresenter
   })
 
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.SortFuncs, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.SortFuncs, {
     func: contact.function.EmployeeSort
   })
 
@@ -656,11 +665,11 @@ export function createModel (builder: Builder): void {
     presenter: contact.component.ContactRefPresenter
   })
 
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.AttributePresenter, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.AttributePresenter, {
     presenter: contact.component.EmployeeRefPresenter
   })
 
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.IgnoreActions, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.IgnoreActions, {
     actions: [view.action.Delete]
   })
 
@@ -671,7 +680,7 @@ export function createModel (builder: Builder): void {
   builder.mixin(contact.class.Person, core.class.Class, view.mixin.ClassFilters, {
     filters: []
   })
-  builder.mixin(contact.class.Employee, core.class.Class, view.mixin.ClassFilters, {
+  builder.mixin(contact.mixin.Employee, core.class.Class, view.mixin.ClassFilters, {
     filters: []
   })
   builder.mixin(contact.class.Organization, core.class.Class, view.mixin.ClassFilters, {
@@ -737,7 +746,7 @@ export function createModel (builder: Builder): void {
         active: true
       },
       category: contact.category.Contact,
-      target: contact.class.Employee,
+      target: contact.mixin.Employee,
       input: 'focus',
       context: {
         mode: ['context'],
@@ -757,7 +766,7 @@ export function createModel (builder: Builder): void {
         active: false
       },
       category: contact.category.Contact,
-      target: contact.class.Employee,
+      target: contact.mixin.Employee,
       input: 'focus',
       context: {
         mode: ['context'],
@@ -773,18 +782,16 @@ export function createModel (builder: Builder): void {
     {
       action: view.actionImpl.ShowPopup,
       actionProps: {
-        component: contact.component.MergeEmployee,
+        component: contact.component.MergePersons,
         element: 'top',
         fillProps: {
           _object: 'value'
         }
       },
-      query: {
-        active: false
-      },
-      label: contact.string.MergeEmployee,
+      query: {},
+      label: contact.string.MergePersons,
       category: contact.category.Contact,
-      target: contact.class.Employee,
+      target: contact.class.Person,
       input: 'focus',
       context: {
         mode: ['context'],
@@ -792,7 +799,7 @@ export function createModel (builder: Builder): void {
       },
       secured: true
     },
-    contact.action.MergeEmployee
+    contact.action.MergePersons
   )
 
   // Allow to use fuzzy search for mixins
diff --git a/models/contact/src/migration.ts b/models/contact/src/migration.ts
index 5495368f3f..942176122e 100644
--- a/models/contact/src/migration.ts
+++ b/models/contact/src/migration.ts
@@ -1,9 +1,11 @@
 //
 
-import { TxOperations } from '@hcengineering/core'
+import { Class, DOMAIN_TX, Doc, Domain, Ref, TxOperations } from '@hcengineering/core'
 import { MigrateOperation, MigrationClient, MigrationUpgradeClient } from '@hcengineering/model'
+import { DOMAIN_COMMENT } from '@hcengineering/model-chunter'
 import core from '@hcengineering/model-core'
-import contact from './index'
+import { DOMAIN_VIEW } from '@hcengineering/model-view'
+import contact, { DOMAIN_CONTACT } from './index'
 
 async function createSpace (tx: TxOperations): Promise<void> {
   const current = await tx.findOne(core.class.Space, {
@@ -43,14 +45,14 @@ async function createSpace (tx: TxOperations): Promise<void> {
 }
 
 async function createEmployeeEmail (client: TxOperations): Promise<void> {
-  const employees = await client.findAll(contact.class.Employee, {})
+  const employees = await client.findAll(contact.mixin.Employee, {})
   const channels = await client.findAll(contact.class.Channel, {
     provider: contact.channelProvider.Email,
     attachedTo: { $in: employees.map((p) => p._id) }
   })
   const channelsMap = new Map(channels.map((p) => [p.attachedTo, p]))
   for (const employee of employees) {
-    const acc = await client.findOne(contact.class.EmployeeAccount, { employee: employee._id })
+    const acc = await client.findOne(contact.class.PersonAccount, { person: employee._id })
     if (acc === undefined) continue
     const current = channelsMap.get(employee._id)
     if (current === undefined) {
@@ -58,7 +60,7 @@ async function createEmployeeEmail (client: TxOperations): Promise<void> {
         contact.class.Channel,
         contact.space.Contacts,
         employee._id,
-        contact.class.Employee,
+        contact.mixin.Employee,
         'channels',
         {
           provider: contact.channelProvider.Email,
@@ -74,7 +76,88 @@ async function createEmployeeEmail (client: TxOperations): Promise<void> {
 }
 
 export const contactOperation: MigrateOperation = {
-  async migrate (client: MigrationClient): Promise<void> {},
+  async migrate (client: MigrationClient): Promise<void> {
+    await client.update(
+      DOMAIN_TX,
+      {
+        objectClass: 'contact:class:EmployeeAccount'
+      },
+      {
+        $rename: { 'attributes.employee': 'attributes.person' },
+        $set: { objectClass: contact.class.PersonAccount }
+      }
+    )
+
+    await client.update(
+      DOMAIN_TX,
+      {
+        objectClass: 'contact:class:Employee'
+      },
+      {
+        $set: { objectClass: contact.mixin.Employee }
+      }
+    )
+
+    await client.update(
+      DOMAIN_TX,
+      {
+        'tx.attributes.backlinkClass': 'contact:class:Employee'
+      },
+      {
+        $set: { 'tx.attributes.backlinkClass': contact.mixin.Employee }
+      }
+    )
+
+    await client.update(
+      DOMAIN_TX,
+      {
+        'tx.attributes.backlinkClass': 'contact:class:Employee'
+      },
+      {
+        $set: { 'tx.attributes.backlinkClass': contact.mixin.Employee }
+      }
+    )
+
+    for (const d of client.hierarchy.domains()) {
+      await client.update(
+        d,
+        { attachedToClass: 'contact:class:Employee' },
+        { $set: { attachedToClass: contact.mixin.Employee } }
+      )
+    }
+    await client.update(
+      DOMAIN_COMMENT,
+      { backlinkClass: 'contact:class:Employee' },
+      { $set: { backlinkClass: contact.mixin.Employee } }
+    )
+    await client.update(
+      'tags' as Domain,
+      { targetClass: 'contact:class:Employee' },
+      { $set: { targetClass: contact.mixin.Employee } }
+    )
+    await client.update(
+      DOMAIN_VIEW,
+      { filterClass: 'contact:class:Employee' },
+      { $set: { filterClass: contact.mixin.Employee } }
+    )
+    await client.update(
+      DOMAIN_CONTACT,
+      {
+        _class: 'contact:class:Employee' as Ref<Class<Doc>>
+      },
+      {
+        $rename: {
+          active: `${contact.mixin.Employee as string}.active`,
+          statuses: `${contact.mixin.Employee as string}.statuses`,
+          displayName: `${contact.mixin.Employee as string}.displayName`,
+          position: `${contact.mixin.Employee as string}.position`
+        },
+        $set: {
+          _class: contact.class.Person
+        }
+      }
+    )
+  },
   async upgrade (client: MigrationUpgradeClient): Promise<void> {
     const tx = new TxOperations(client, core.account.System)
     await createSpace(tx)
diff --git a/models/contact/src/plugin.ts b/models/contact/src/plugin.ts
index 79946f6c10..0f046552a8 100644
--- a/models/contact/src/plugin.ts
+++ b/models/contact/src/plugin.ts
@@ -36,8 +36,8 @@ export default mergeIds(contactId, contact, {
     OrganizationPresenter: '' as AnyComponent,
     Contacts: '' as AnyComponent,
     ContactsTabs: '' as AnyComponent,
-    EmployeeAccountPresenter: '' as AnyComponent,
-    EmployeeAccountRefPresenter: '' as AnyComponent,
+    PersonAccountPresenter: '' as AnyComponent,
+    PersonAccountRefPresenter: '' as AnyComponent,
     OrganizationEditor: '' as AnyComponent,
     EmployeePresenter: '' as AnyComponent,
     EmployeeRefPresenter: '' as AnyComponent,
@@ -52,13 +52,13 @@ export default mergeIds(contactId, contact, {
     CreateEmployee: '' as AnyComponent,
     AccountArrayEditor: '' as AnyComponent,
     ChannelFilter: '' as AnyComponent,
-    MergeEmployee: '' as AnyComponent,
+    MergePersons: '' as AnyComponent,
     ActivityChannelMessage: '' as AnyComponent,
     ChannelPanel: '' as AnyComponent,
     ActivityChannelPresenter: '' as AnyComponent,
     EmployeeFilter: '' as AnyComponent,
     EmployeeFilterValuePresenter: '' as AnyComponent,
-    EmployeeAccountFilterValuePresenter: '' as AnyComponent
+    PersonAccountFilterValuePresenter: '' as AnyComponent
   },
   string: {
     Persons: '' as IntlString,
@@ -114,7 +114,7 @@ export default mergeIds(contactId, contact, {
   action: {
     KickEmployee: '' as Ref<Action>,
     DeleteEmployee: '' as Ref<Action>,
-    MergeEmployee: '' as Ref<Action>
+    MergePersons: '' as Ref<Action>
   },
   actionImpl: {
     KickEmployee: '' as ViewAction,
diff --git a/models/document/src/index.ts b/models/document/src/index.ts
index 492b65bf7f..aba886af6e 100644
--- a/models/document/src/index.ts
+++ b/models/document/src/index.ts
@@ -133,13 +133,13 @@ export class TDocument extends TDoc implements Document {
   @Hidden()
     versions!: number
 
-  @Prop(ArrOf(TypeRef(contact.class.Employee)), document.string.Authors)
+  @Prop(ArrOf(TypeRef(contact.mixin.Employee)), document.string.Authors)
     authors!: Ref<Employee>[]
 
-  @Prop(ArrOf(TypeRef(contact.class.Employee)), document.string.Reviewers)
+  @Prop(ArrOf(TypeRef(contact.mixin.Employee)), document.string.Reviewers)
     reviewers!: Ref<Employee>[]
 
-  @Prop(ArrOf(TypeRef(contact.class.Employee)), document.string.Approvers)
+  @Prop(ArrOf(TypeRef(contact.mixin.Employee)), document.string.Approvers)
     approvers!: Ref<Employee>[]
 
   @Prop(Collection(document.class.DocumentRequest), document.string.Requests)
diff --git a/models/hr/src/index.ts b/models/hr/src/index.ts
index 2ae5d2e3c9..4b5721c0b9 100644
--- a/models/hr/src/index.ts
+++ b/models/hr/src/index.ts
@@ -43,7 +43,7 @@ import {
 import attachment from '@hcengineering/model-attachment'
 import calendar from '@hcengineering/model-calendar'
 import chunter from '@hcengineering/model-chunter'
-import contact, { TEmployee, TEmployeeAccount } from '@hcengineering/model-contact'
+import contact, { TEmployee, TPersonAccount } from '@hcengineering/model-contact'
 import core, { TAttachedDoc, TDoc, TSpace, TType } from '@hcengineering/model-core'
 import view, { classPresenter, createAction } from '@hcengineering/model-view'
 import workbench from '@hcengineering/model-workbench'
@@ -80,7 +80,7 @@ export class TDepartment extends TSpace implements Department {
 
   avatar?: string | null
 
-  @Prop(TypeRef(contact.class.Employee), hr.string.TeamLead)
+  @Prop(TypeRef(contact.mixin.Employee), hr.string.TeamLead)
     teamLead!: Ref<Employee> | null
 
   @Prop(ArrOf(TypeRef(hr.class.DepartmentMember)), contact.string.Members)
@@ -89,15 +89,15 @@ export class TDepartment extends TSpace implements Department {
   @Prop(ArrOf(TypeRef(contact.class.Contact)), hr.string.Subscribers)
     subscribers?: Arr<Ref<Contact>>
 
-  @Prop(ArrOf(TypeRef(contact.class.Employee)), hr.string.Managers)
+  @Prop(ArrOf(TypeRef(contact.mixin.Employee)), hr.string.Managers)
     managers!: Arr<Ref<Employee>>
 }
 
-@Model(hr.class.DepartmentMember, contact.class.EmployeeAccount)
+@Model(hr.class.DepartmentMember, contact.class.PersonAccount)
 @UX(contact.string.Employee, hr.icon.HR)
-export class TDepartmentMember extends TEmployeeAccount implements DepartmentMember {}
+export class TDepartmentMember extends TPersonAccount implements DepartmentMember {}
 
-@Mixin(hr.mixin.Staff, contact.class.Employee)
+@Mixin(hr.mixin.Staff, contact.mixin.Employee)
 @UX(hr.string.Staff, hr.icon.HR, 'STFF', 'name')
 export class TStaff extends TEmployee implements Staff {
   @Prop(TypeRef(hr.class.Department), hr.string.Department)
diff --git a/models/lead/src/index.ts b/models/lead/src/index.ts
index 4328121a13..d4bdbc44df 100644
--- a/models/lead/src/index.ts
+++ b/models/lead/src/index.ts
@@ -78,7 +78,7 @@ export class TLead extends TTask implements Lead {
   @Index(IndexKind.FullText)
     title!: string
 
-  @Prop(TypeRef(contact.class.Employee), lead.string.Assignee)
+  @Prop(TypeRef(contact.mixin.Employee), lead.string.Assignee)
   declare assignee: Ref<Employee> | null
 
   @Prop(TypeRef(task.class.State), task.string.TaskState, { _id: task.attribute.State })
diff --git a/models/recruit/src/index.ts b/models/recruit/src/index.ts
index 7b5fb162c0..4b69794a39 100644
--- a/models/recruit/src/index.ts
+++ b/models/recruit/src/index.ts
@@ -162,7 +162,7 @@ export class TApplicant extends TTask implements Applicant {
   @Prop(TypeDate(), task.string.StartDate)
     startDate!: Timestamp | null
 
-  @Prop(TypeRef(contact.class.Employee), recruit.string.AssignedRecruiter)
+  @Prop(TypeRef(contact.mixin.Employee), recruit.string.AssignedRecruiter)
   declare assignee: Ref<Employee> | null
 
   @Prop(TypeRef(task.class.State), task.string.TaskState, { _id: task.attribute.State })
@@ -1105,7 +1105,7 @@ export function createModel (builder: Builder): void {
     actionPopup: view.component.ValueSelector,
     actionProps: {
       attribute: 'assignee',
-      _class: contact.class.Employee,
+      _class: contact.mixin.Employee,
       query: {},
       placeholder: recruit.string.AssignRecruiter
     },
diff --git a/models/recruit/src/review.ts b/models/recruit/src/review.ts
index 0a43603106..099af76e78 100644
--- a/models/recruit/src/review.ts
+++ b/models/recruit/src/review.ts
@@ -13,7 +13,7 @@ import { generateClassNotificationTypes } from '@hcengineering/model-notificatio
 export const reviewTableOptions: FindOptions<Review> = {
   lookup: {
     attachedTo: recruit.mixin.Candidate,
-    participants: contact.class.Employee,
+    participants: contact.mixin.Employee,
     company: contact.class.Organization
   }
 }
diff --git a/models/request/src/index.ts b/models/request/src/index.ts
index 6d19fd6de4..3a1921d813 100644
--- a/models/request/src/index.ts
+++ b/models/request/src/index.ts
@@ -15,7 +15,7 @@
 
 import activity from '@hcengineering/activity'
 import chunter from '@hcengineering/chunter'
-import type { EmployeeAccount } from '@hcengineering/contact'
+import type { PersonAccount } from '@hcengineering/contact'
 import contact from '@hcengineering/contact'
 import { Domain, IndexKind, Ref, Tx } from '@hcengineering/core'
 import {
@@ -48,13 +48,13 @@ export const DOMAIN_REQUEST = 'request' as Domain
 @Model(request.class.Request, core.class.AttachedDoc, DOMAIN_REQUEST)
 @UX(request.string.Request, request.icon.Requests)
 export class TRequest extends TAttachedDoc implements Request {
-  @Prop(ArrOf(TypeRef(contact.class.EmployeeAccount)), request.string.Requested)
+  @Prop(ArrOf(TypeRef(contact.class.PersonAccount)), request.string.Requested)
   @Index(IndexKind.Indexed)
-    requested!: Ref<EmployeeAccount>[]
+    requested!: Ref<PersonAccount>[]
 
-  @Prop(ArrOf(TypeRef(contact.class.EmployeeAccount)), request.string.Approved)
+  @Prop(ArrOf(TypeRef(contact.class.PersonAccount)), request.string.Approved)
   @ReadOnly()
-    approved!: Ref<EmployeeAccount>[]
+    approved!: Ref<PersonAccount>[]
 
   requiredApprovesCount!: number
 
@@ -64,9 +64,9 @@ export class TRequest extends TAttachedDoc implements Request {
 
   tx!: Tx
 
-  @Prop(TypeRef(contact.class.EmployeeAccount), request.string.Rejected)
+  @Prop(TypeRef(contact.class.PersonAccount), request.string.Rejected)
   @ReadOnly()
-    rejected?: Ref<EmployeeAccount>
+    rejected?: Ref<PersonAccount>
 
   @Prop(Collection(chunter.class.Comment), chunter.string.Comments)
     comments?: number
diff --git a/models/server-calendar/src/index.ts b/models/server-calendar/src/index.ts
index b70670f11d..53b8353560 100644
--- a/models/server-calendar/src/index.ts
+++ b/models/server-calendar/src/index.ts
@@ -34,10 +34,10 @@ export function createModel (builder: Builder): void {
   })
 
   builder.createDoc(serverCore.class.Trigger, core.space.Model, {
-    trigger: serverCalendar.trigger.OnEmployeeAccountCreate,
+    trigger: serverCalendar.trigger.OnPersonAccountCreate,
     txMatch: {
       _class: core.class.TxCreateDoc,
-      objectClass: contact.class.EmployeeAccount
+      objectClass: contact.class.PersonAccount
     }
   })
 
diff --git a/models/server-contact/src/index.ts b/models/server-contact/src/index.ts
index 54e35744b3..43bd02ea71 100644
--- a/models/server-contact/src/index.ts
+++ b/models/server-contact/src/index.ts
@@ -55,12 +55,4 @@ export function createModel (builder: Builder): void {
       _class: core.class.TxUpdateDoc
     }
   })
-
-  builder.createDoc(serverCore.class.Trigger, core.space.Model, {
-    trigger: serverContact.trigger.OnEmployeeUpdate,
-    txMatch: {
-      objectClass: contact.class.Employee,
-      _class: core.class.TxUpdateDoc
-    }
-  })
 }
diff --git a/models/task/src/index.ts b/models/task/src/index.ts
index e9cea8f587..3ceb17f187 100644
--- a/models/task/src/index.ts
+++ b/models/task/src/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import type { Employee } from '@hcengineering/contact'
+import type { Employee, Person } from '@hcengineering/contact'
 import contact from '@hcengineering/contact'
 import attachment from '@hcengineering/model-attachment'
 import chunter from '@hcengineering/model-chunter'
@@ -101,8 +101,8 @@ export class TTask extends TAttachedDoc implements Task {
   @Hidden()
     number!: number
 
-  // @Prop(TypeRef(contact.class.Employee), task.string.TaskAssignee)
-  assignee!: Ref<Employee> | null
+  // @Prop(TypeRef(contact.mixin.Employee), task.string.TaskAssignee)
+  assignee!: Ref<Person> | null
 
   @Prop(TypeDate(), task.string.DueDate, { editor: task.component.DueDateEditor })
     dueDate!: Timestamp | null
@@ -126,7 +126,7 @@ export class TTodoItem extends TAttachedDoc implements TodoItem {
   @Index(IndexKind.FullText)
     name!: string
 
-  @Prop(TypeRef(contact.class.Employee), task.string.TaskAssignee)
+  @Prop(TypeRef(contact.mixin.Employee), task.string.TaskAssignee)
     assignee!: Ref<Employee> | null
 
   @Prop(TypeBoolean(), task.string.TaskDone)
diff --git a/models/tracker/src/index.ts b/models/tracker/src/index.ts
index c877a83b37..0c951dfd51 100644
--- a/models/tracker/src/index.ts
+++ b/models/tracker/src/index.ts
@@ -14,7 +14,7 @@
 //
 
 import activity from '@hcengineering/activity'
-import contact, { Employee } from '@hcengineering/contact'
+import contact, { Employee, Person } from '@hcengineering/contact'
 import {
   DOMAIN_MODEL,
   DateRangeMode,
@@ -135,7 +135,7 @@ export class TProject extends TSpaceWithStates implements Project {
   @Prop(TypeRef(tracker.class.IssueStatus), tracker.string.DefaultIssueStatus)
     defaultIssueStatus!: Ref<IssueStatus>
 
-  @Prop(TypeRef(contact.class.Employee), tracker.string.DefaultAssignee)
+  @Prop(TypeRef(contact.mixin.Employee), tracker.string.DefaultAssignee)
     defaultAssignee!: Ref<Employee>
 
   declare defaultTimeReportDay: TimeReportDayType
@@ -183,9 +183,9 @@ export class TIssue extends TTask implements Issue {
   @ReadOnly()
     number!: number
 
-  @Prop(TypeRef(contact.class.Employee), tracker.string.Assignee)
+  @Prop(TypeRef(contact.class.Person), tracker.string.Assignee)
   @Index(IndexKind.Indexed)
-    assignee!: Ref<Employee> | null
+    assignee!: Ref<Person> | null
 
   @Prop(TypeRef(tracker.class.Component), tracker.string.Component, { icon: tracker.icon.Component })
   @Index(IndexKind.Indexed)
@@ -256,8 +256,8 @@ export class TIssueTemplate extends TDoc implements IssueTemplate {
   @Prop(TypeIssuePriority(), tracker.string.Priority)
     priority!: IssuePriority
 
-  @Prop(TypeRef(contact.class.Employee), tracker.string.Assignee)
-    assignee!: Ref<Employee> | null
+  @Prop(TypeRef(contact.class.Person), tracker.string.Assignee)
+    assignee!: Ref<Person> | null
 
   @Prop(TypeRef(tracker.class.Component), tracker.string.Component)
     component!: Ref<Component> | null
@@ -298,7 +298,7 @@ export class TTimeSpendReport extends TAttachedDoc implements TimeSpendReport {
   @Prop(TypeRef(tracker.class.Issue), tracker.string.Parent)
   declare attachedTo: Ref<Issue>
 
-  @Prop(TypeRef(contact.class.Employee), contact.string.Employee)
+  @Prop(TypeRef(contact.mixin.Employee), contact.string.Employee)
     employee!: Ref<Employee>
 
   @Prop(TypeDate(), tracker.string.TimeSpendReportDate)
@@ -324,7 +324,7 @@ export class TComponent extends TDoc implements Component {
   @Prop(TypeMarkup(), tracker.string.Description)
     description?: Markup
 
-  @Prop(TypeRef(contact.class.Employee), tracker.string.ComponentLead)
+  @Prop(TypeRef(contact.mixin.Employee), tracker.string.ComponentLead)
     lead!: Ref<Employee> | null
 
   @Prop(Collection(chunter.class.Comment), chunter.string.Comments)
@@ -1584,7 +1584,7 @@ export function createModel (builder: Builder): void {
       actionPopup: view.component.ValueSelector,
       actionProps: {
         attribute: 'assignee',
-        _class: contact.class.Employee,
+        _class: contact.mixin.Employee,
         query: {},
         placeholder: tracker.string.AssignTo
       },
@@ -2006,7 +2006,7 @@ export function createModel (builder: Builder): void {
             dividerBefore: true,
             key: 'lead'
           },
-          props: { _class: tracker.class.Component, defaultClass: contact.class.Employee, shouldShowLabel: false }
+          props: { _class: tracker.class.Component, defaultClass: contact.mixin.Employee, shouldShowLabel: false }
         }
       ]
     },
diff --git a/packages/core/src/client.ts b/packages/core/src/client.ts
index 5791a59f39..a8601caa03 100644
--- a/packages/core/src/client.ts
+++ b/packages/core/src/client.ts
@@ -279,16 +279,17 @@ async function loadModel (
   console.log('find' + (lastTxTime >= 0 ? 'full model' : 'model diff'), atxes.length, Date.now() - t)
 
   // Ignore Employee accounts.
-  function isEmployeeAccount (tx: Tx): boolean {
+  function isPersonAccount (tx: Tx): boolean {
     return (
       (tx._class === core.class.TxCreateDoc ||
         tx._class === core.class.TxUpdateDoc ||
         tx._class === core.class.TxRemoveDoc) &&
-      (tx as TxCUD<Doc>).objectClass === 'contact:class:EmployeeAccount'
+      ((tx as TxCUD<Doc>).objectClass === 'contact:class:PersonAccount' ||
+        (tx as TxCUD<Doc>).objectClass === 'contact:class:Account')
     )
   }
 
-  atxes.forEach((tx) => (tx.modifiedBy === core.account.System && !isEmployeeAccount(tx) ? systemTx : userTx).push(tx))
+  atxes.forEach((tx) => (tx.modifiedBy === core.account.System && !isPersonAccount(tx) ? systemTx : userTx).push(tx))
 
   if (allowedPlugins != null) {
     fillConfiguration(systemTx, configs)
diff --git a/packages/core/src/operations.ts b/packages/core/src/operations.ts
index 396d5a2b68..040ee91286 100644
--- a/packages/core/src/operations.ts
+++ b/packages/core/src/operations.ts
@@ -227,10 +227,11 @@ export class TxOperations implements Omit<Client, 'notify'> {
     modifiedBy?: Ref<Account>
   ): Promise<TxResult> {
     const hierarchy = this.client.getHierarchy()
-    if (hierarchy.isMixin(doc._class)) {
+    const mixClass = Hierarchy.mixinOrClass(doc)
+    if (hierarchy.isMixin(mixClass)) {
       // TODO: Rework it is wrong, we need to split values to mixin update and original document update if mixed.
       const baseClass = hierarchy.getBaseClass(doc._class)
-      return this.updateMixin(doc._id, baseClass, doc.space, doc._class, update, modifiedOn, modifiedBy)
+      return this.updateMixin(doc._id, baseClass, doc.space, mixClass, update, modifiedOn, modifiedBy)
     }
     if (hierarchy.isDerived(doc._class, core.class.AttachedDoc)) {
       const adoc = doc as unknown as AttachedDoc
diff --git a/packages/platform/src/lang/en.json b/packages/platform/src/lang/en.json
index 90d2718155..8a5fc3fd8f 100644
--- a/packages/platform/src/lang/en.json
+++ b/packages/platform/src/lang/en.json
@@ -16,7 +16,6 @@
     "AccountAlreadyExists": "Account already exists",
     "WorkspaceRateLimit": "Server is busy, Please wait a bit and try again",
     "AccountAlreadyConfirmed": "Account already confirmed",
-    "AccountWasMerged": "Account was merged",
     "WorkspaceAlreadyExists": "Workspace already exists",
     "ProductIdMismatch": "Product Mismatch"
   }
diff --git a/packages/platform/src/lang/ru.json b/packages/platform/src/lang/ru.json
index c23c9cc331..8114333e32 100644
--- a/packages/platform/src/lang/ru.json
+++ b/packages/platform/src/lang/ru.json
@@ -16,7 +16,6 @@
     "AccountAlreadyExists": "Аккаунт уже существует",
     "WorkspaceRateLimit": "Сервер перегружен, Пожалуйста подождите",
     "AccountAlreadyConfirmed": "Аккаунт уже подтвержден",
-    "AccountWasMerged": "Аккаунт был объединен",
     "WorkspaceAlreadyExists": "Рабочее пространство уже существует",
     "ProductIdMismatch": "Продукт не соответсвует"
   }
diff --git a/packages/platform/src/platform.ts b/packages/platform/src/platform.ts
index 8db4f0c7da..67714eb691 100644
--- a/packages/platform/src/platform.ts
+++ b/packages/platform/src/platform.ts
@@ -150,7 +150,6 @@ export default plugin(platformId, {
     InvalidPassword: '' as StatusCode<{ account: string }>,
     AccountAlreadyExists: '' as StatusCode<{ account: string }>,
     AccountAlreadyConfirmed: '' as StatusCode<{ account: string }>,
-    AccountWasMerged: '' as StatusCode<{ account: string }>,
     WorkspaceAlreadyExists: '' as StatusCode<{ workspace: string }>,
     WorkspaceRateLimit: '' as StatusCode<{ workspace: string }>,
     ProductIdMismatch: '' as StatusCode<{ productId: string }>
diff --git a/packages/presentation/src/components/AttributeBarEditor.svelte b/packages/presentation/src/components/AttributeBarEditor.svelte
index bd816bf838..bf66f27a0a 100644
--- a/packages/presentation/src/components/AttributeBarEditor.svelte
+++ b/packages/presentation/src/components/AttributeBarEditor.svelte
@@ -76,6 +76,7 @@
       <svelte:component
         this={editor}
         readonly={isReadonly}
+        disabled="(isReadonly)"
         label={attribute?.label}
         placeholder={attribute?.label}
         {kind}
@@ -101,6 +102,7 @@
         {attributeKey}
         value={getAttribute(client, object, { key: attributeKey, attr: attribute })}
         readonly={isReadonly}
+        disabled="(isReadonly)"
         space={object.space}
         {onChange}
         {focus}
diff --git a/packages/presentation/src/components/ObjectPopup.svelte b/packages/presentation/src/components/ObjectPopup.svelte
index 2c6a9bb4ce..3b88084247 100644
--- a/packages/presentation/src/components/ObjectPopup.svelte
+++ b/packages/presentation/src/components/ObjectPopup.svelte
@@ -47,6 +47,10 @@
   export let readonly = false
   export let disallowDeselect: Ref<Doc>[] | undefined = undefined
 
+  export let filter: (it: Doc) => boolean = () => {
+    return true
+  }
+
   const created: Doc[] = []
   const dispatch = createEventDispatcher()
 
@@ -75,9 +79,9 @@
       })
       if (created.length > 0) {
         const cmap = new Set(created.map((it) => it._id))
-        objects = [...created, ...result.filter((d) => !cmap.has(d._id))]
+        objects = [...created, ...result.filter((d) => !cmap.has(d._id))].filter(filter)
       } else {
-        objects = result
+        objects = result.filter(filter)
       }
     },
     { ...(options ?? {}), limit: 200 }
diff --git a/packages/presentation/src/components/message/Nodes.svelte b/packages/presentation/src/components/message/Nodes.svelte
index 4f00377d30..e36bc38fc3 100644
--- a/packages/presentation/src/components/message/Nodes.svelte
+++ b/packages/presentation/src/components/message/Nodes.svelte
@@ -48,6 +48,12 @@
       }
     } catch {}
   }
+  function correctClass (clName: string): string {
+    if (clName === 'contact:class:Employee') {
+      return 'contact:mixin:Employee'
+    }
+    return clName
+  }
 </script>
 
 {#if nodes}
@@ -121,7 +127,7 @@
             props={{
               objectId: node.getAttribute('data-id'),
               title: node.getAttribute('data-label'),
-              _class: node.getAttribute('data-objectclass'),
+              _class: correctClass(node.getAttribute('data-objectclass')),
               inline: true
             }}
           />
diff --git a/plugins/activity-resources/src/components/TxView.svelte b/plugins/activity-resources/src/components/TxView.svelte
index f4d137a1a7..20e9596891 100644
--- a/plugins/activity-resources/src/components/TxView.svelte
+++ b/plugins/activity-resources/src/components/TxView.svelte
@@ -17,7 +17,7 @@
   import type { DisplayTx, TxViewlet } from '@hcengineering/activity'
   import attachment from '@hcengineering/attachment'
   import chunter from '@hcengineering/chunter'
-  import contact, { Employee, EmployeeAccount, getName } from '@hcengineering/contact'
+  import contact, { Employee, PersonAccount, getName } from '@hcengineering/contact'
   import core, { AnyAttribute, Class, Doc, Ref, TxCUD, getCurrentAccount } from '@hcengineering/core'
   import { Asset } from '@hcengineering/platform'
   import { createQuery, getClient } from '@hcengineering/presentation'
@@ -55,7 +55,7 @@
 
   let viewlet: TxDisplayViewlet | undefined
   let props: any
-  let account: EmployeeAccount | undefined
+  let account: PersonAccount | undefined
   let employee: Employee | undefined
   let model: AttributeModel[] = []
   let modelIcon: Asset | undefined = undefined
@@ -97,8 +97,8 @@
   })
 
   $: query.query(
-    contact.class.EmployeeAccount,
-    { _id: tx.tx.modifiedBy as Ref<EmployeeAccount> },
+    contact.class.PersonAccount,
+    { _id: tx.tx.modifiedBy as Ref<PersonAccount> },
     (res) => {
       ;[account] = res
     },
@@ -107,8 +107,8 @@
 
   $: account &&
     employeeQuery.query(
-      contact.class.Employee,
-      { _id: account.employee },
+      contact.mixin.Employee,
+      { _id: account.person as Ref<Employee> },
       (res) => {
         ;[employee] = res
       },
@@ -213,7 +213,7 @@
         <div class="msgactivity-content__title labels-row">
           <span class={withAvatar ? 'bold' : 'strong'}>
             {#if employee}
-              {getName(employee)}
+              {getName(client.getHierarchy(), employee)}
             {:else}
               <Label label={core.string.System} />
             {/if}
diff --git a/plugins/attachment-resources/src/components/FileBrowser.svelte b/plugins/attachment-resources/src/components/FileBrowser.svelte
index 591e5ae841..0fdf996c4a 100644
--- a/plugins/attachment-resources/src/components/FileBrowser.svelte
+++ b/plugins/attachment-resources/src/components/FileBrowser.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { Attachment } from '@hcengineering/attachment'
-  import contact, { Employee, EmployeeAccount } from '@hcengineering/contact'
+  import contact, { Person, PersonAccount } from '@hcengineering/contact'
   import core, { Class, getCurrentAccount, Ref, Space } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
   import { Label, Loading, navigate, TabList, SearchEdit, getLocation } from '@hcengineering/ui'
@@ -38,8 +38,8 @@
     navigate(loc)
   }
   export let requestedSpaceClasses: Ref<Class<Space>>[] = []
-  const currentUser = getCurrentAccount() as EmployeeAccount
-  let selectedParticipants: Ref<Employee>[] = [currentUser.employee]
+  const currentUser = getCurrentAccount() as PersonAccount
+  let selectedParticipants: Ref<Person>[] = [currentUser.person]
   let selectedSpaces: Ref<Space>[] = []
   export let search: string = ''
   let isLoading = false
@@ -58,14 +58,14 @@
     selectedSort_: FileBrowserSortMode,
     selectedFileTypeId_: string,
     selectedDateId_: string,
-    selectedParticipants_: Ref<Employee>[],
+    selectedParticipants_: Ref<Person>[],
     selectedSpaces_: Ref<Space>[]
   ) {
     isLoading = true
 
     const nameQuery = searchQuery_ ? { name: { $like: '%' + searchQuery_ + '%' } } : {}
 
-    const accounts = await client.findAll(contact.class.EmployeeAccount, { employee: { $in: selectedParticipants_ } })
+    const accounts = await client.findAll(contact.class.PersonAccount, { person: { $in: selectedParticipants_ } })
     const senderQuery = accounts.length ? { modifiedBy: { $in: accounts.map((a) => a._id) } } : {}
 
     let spaceQuery: { space: any }
diff --git a/plugins/attachment-resources/src/components/FileBrowserFilters.svelte b/plugins/attachment-resources/src/components/FileBrowserFilters.svelte
index 4bc88cce90..aaf30733ff 100644
--- a/plugins/attachment-resources/src/components/FileBrowserFilters.svelte
+++ b/plugins/attachment-resources/src/components/FileBrowserFilters.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Employee } from '@hcengineering/contact'
+  import { Person } from '@hcengineering/contact'
   import { Class, Ref, Space } from '@hcengineering/core'
   import { SpaceMultiBoxList } from '@hcengineering/presentation'
   import { Component, DropdownLabelsIntl } from '@hcengineering/ui'
@@ -23,7 +23,7 @@
 
   export let requestedSpaceClasses: Ref<Class<Space>>[]
   export let spaceId: Ref<Space> | undefined
-  export let selectedParticipants: Ref<Employee>[]
+  export let selectedParticipants: Ref<Person>[]
   export let selectedSpaces: Ref<Space>[]
   export let selectedDateId: string
   export let selectedFileTypeId: string
diff --git a/plugins/bitrix/src/sync.ts b/plugins/bitrix/src/sync.ts
index 88d6479798..f4f38ab85c 100644
--- a/plugins/bitrix/src/sync.ts
+++ b/plugins/bitrix/src/sync.ts
@@ -1,6 +1,6 @@
 import attachment, { Attachment } from '@hcengineering/attachment'
 import chunter, { Comment } from '@hcengineering/chunter'
-import contact, { Channel, combineName, Contact, EmployeeAccount } from '@hcengineering/contact'
+import contact, { Channel, combineName, Contact, Employee, PersonAccount } from '@hcengineering/contact'
 import core, {
   Account,
   AccountRole,
@@ -489,8 +489,8 @@ interface SyncOptionsExtra {
   ownerTypeValues: BitrixOwnerType[]
   commentFieldKeys: string[]
   allMappings: FindResult<BitrixEntityMapping>
-  allEmployee: FindResult<EmployeeAccount>
-  userList: Map<string, Ref<EmployeeAccount>>
+  allEmployee: FindResult<PersonAccount>
+  userList: Map<string, Ref<PersonAccount>>
 }
 
 /**
@@ -505,7 +505,7 @@ export async function performSynchronization (ops: SyncOptions): Promise<BitrixS
 
   const commentFieldKeys = Object.keys(commentFields.result)
 
-  const allEmployee = await ops.client.findAll(contact.class.EmployeeAccount, {})
+  const allEmployee = await ops.client.findAll(contact.class.PersonAccount, {})
 
   const allMappings = await ops.client.findAll<BitrixEntityMapping>(
     bitrix.class.EntityMapping,
@@ -519,7 +519,7 @@ export async function performSynchronization (ops: SyncOptions): Promise<BitrixS
     }
   )
 
-  const userList = new Map<string, Ref<EmployeeAccount>>()
+  const userList = new Map<string, Ref<PersonAccount>>()
 
   // Fill all users and create new ones, if required.
   await synchronizeUsers(userList, ops, allEmployee)
@@ -764,7 +764,7 @@ async function downloadComments (
     syncEmails?: boolean
   },
   commentFieldKeys: string[],
-  userList: Map<string, Ref<EmployeeAccount>>,
+  userList: Map<string, Ref<PersonAccount>>,
   ownerTypeValues: BitrixOwnerType[]
 ): Promise<void> {
   const entityType = ops.mapping.type.replace('crm.', '')
@@ -887,7 +887,7 @@ async function downloadComments (
 }
 
 async function synchronizeUsers (
-  userList: Map<string, Ref<EmployeeAccount>>,
+  userList: Map<string, Ref<PersonAccount>>,
   ops: {
     client: TxOperations
     bitrixClient: BitrixClient
@@ -900,13 +900,13 @@ async function synchronizeUsers (
     monitor: (total: number) => void
     blobProvider?: ((blobRef: { file: string, id: string }) => Promise<Blob | undefined>) | undefined
   },
-  allEmployee: FindResult<EmployeeAccount>
+  allEmployee: FindResult<PersonAccount>
 ): Promise<void> {
   let totalUsers = 1
   let next = 0
 
   const employeesList = await ops.client.findAll(
-    contact.class.Employee,
+    contact.mixin.Employee,
     {},
     {
       lookup: {
@@ -929,23 +929,25 @@ async function synchronizeUsers (
         // Try to find from employee
         employeesList.forEach((it) => {
           if ((it.$lookup?.channels as Channel[])?.some((q) => q.value === u.EMAIL)) {
-            account = allEmployee.find((qit) => qit.employee === it._id)
+            account = allEmployee.find((qit) => qit.person === it._id)
           }
         })
       }
 
       let accountId = account?._id
       if (accountId === undefined) {
-        const employeeId = await ops.client.createDoc(contact.class.Employee, contact.space.Contacts, {
+        const employeeId = await ops.client.createDoc(contact.class.Person, contact.space.Contacts, {
           name: combineName(u.NAME, u.LAST_NAME),
           avatar: u.PERSONAL_PHOTO,
-          active: u.ACTIVE,
           city: u.PERSONAL_CITY
         })
-        accountId = await ops.client.createDoc(contact.class.EmployeeAccount, core.space.Model, {
+        await ops.client.createMixin(employeeId, contact.class.Person, contact.space.Contacts, contact.mixin.Employee, {
+          active: u.ACTIVE
+        })
+        accountId = await ops.client.createDoc(contact.class.PersonAccount, core.space.Model, {
           email: u.EMAIL,
           name: combineName(u.NAME, u.LAST_NAME),
-          employee: employeeId,
+          person: employeeId,
           role: AccountRole.User
         })
         if (u.EMAIL !== undefined && u.EMAIL !== null) {
@@ -953,7 +955,7 @@ async function synchronizeUsers (
             contact.class.Channel,
             contact.space.Contacts,
             employeeId,
-            contact.class.Employee,
+            contact.mixin.Employee,
             'channels',
             {
               provider: contact.channelProvider.Email,
@@ -963,7 +965,7 @@ async function synchronizeUsers (
         }
         await ops.client.createMixin<Doc, BitrixSyncDoc>(
           employeeId,
-          contact.class.Employee,
+          contact.mixin.Employee,
           contact.space.Contacts,
           bitrix.mixin.BitrixSyncDoc,
           {
@@ -973,7 +975,7 @@ async function synchronizeUsers (
           }
         )
       } else if (account != null) {
-        const emp = employees.get(account.employee)
+        const emp = employees.get(account.person as unknown as Ref<Employee>)
         if (emp !== undefined && !ops.client.getHierarchy().hasMixin(emp, bitrix.mixin.BitrixSyncDoc)) {
           await ops.client.createMixin<Doc, BitrixSyncDoc>(emp._id, emp._class, emp.space, bitrix.mixin.BitrixSyncDoc, {
             type: 'employee',
diff --git a/plugins/bitrix/src/utils.ts b/plugins/bitrix/src/utils.ts
index 665b30f323..91e11c72ba 100644
--- a/plugins/bitrix/src/utils.ts
+++ b/plugins/bitrix/src/utils.ts
@@ -1,5 +1,5 @@
 import attachment, { Attachment } from '@hcengineering/attachment'
-import contact, { Channel, EmployeeAccount, Organization } from '@hcengineering/contact'
+import contact, { Channel, PersonAccount, Organization } from '@hcengineering/contact'
 import core, {
   AnyAttribute,
   AttachedDoc,
@@ -102,7 +102,7 @@ export async function convert (
   space: Ref<Space>,
   fields: BitrixFieldMapping[],
   rawDocument: any,
-  userList: Map<string, Ref<EmployeeAccount>>,
+  userList: Map<string, Ref<PersonAccount>>,
   existingDoc: WithLookup<Doc> | undefined,
   defaultCategories: TagCategory[],
   allTagElements: TagElement[],
diff --git a/plugins/board-resources/src/components/UserBoxList.svelte b/plugins/board-resources/src/components/UserBoxList.svelte
index d618ac1ae5..65abaa0c4d 100644
--- a/plugins/board-resources/src/components/UserBoxList.svelte
+++ b/plugins/board-resources/src/components/UserBoxList.svelte
@@ -3,8 +3,8 @@
   import { Ref } from '@hcengineering/core'
 
   import contact from '@hcengineering/contact'
-  import board from '../plugin'
   import { Component } from '@hcengineering/ui'
+  import board from '../plugin'
 
   export let value: Ref<Employee>[]
   export let readonly = false
diff --git a/plugins/board-resources/src/components/editor/CardChecklist.svelte b/plugins/board-resources/src/components/editor/CardChecklist.svelte
index de082ac2f5..a9c9ac22a2 100644
--- a/plugins/board-resources/src/components/editor/CardChecklist.svelte
+++ b/plugins/board-resources/src/components/editor/CardChecklist.svelte
@@ -16,20 +16,20 @@
   import { Employee } from '@hcengineering/contact'
   import { EmployeeBox } from '@hcengineering/contact-resources'
   import { Ref } from '@hcengineering/core'
-  import { createQuery, getClient, MessageBox } from '@hcengineering/presentation'
+  import { MessageBox, createQuery, getClient } from '@hcengineering/presentation'
   import type { TodoItem } from '@hcengineering/task'
   import task, { calcRank } from '@hcengineering/task'
   import {
     Button,
     CheckBox,
     DateRangePresenter,
-    getEventPopupPositionElement,
     IconAdd,
     IconDelete,
     IconMoreH,
     Progress,
-    showPopup,
-    TextAreaEditor
+    TextAreaEditor,
+    getEventPopupPositionElement,
+    showPopup
   } from '@hcengineering/ui'
   import { ContextMenu, HTMLPresenter } from '@hcengineering/view-resources'
 
diff --git a/plugins/board-resources/src/utils/CardUtils.ts b/plugins/board-resources/src/utils/CardUtils.ts
index 137b8f38c5..7b89c7a9b9 100644
--- a/plugins/board-resources/src/utils/CardUtils.ts
+++ b/plugins/board-resources/src/utils/CardUtils.ts
@@ -1,5 +1,5 @@
 import { Card } from '@hcengineering/board'
-import { Employee, EmployeeAccount } from '@hcengineering/contact'
+import { Employee, PersonAccount } from '@hcengineering/contact'
 import {
   TxOperations as Client,
   TxResult,
@@ -86,9 +86,9 @@ export function canAddCurrentUser (card: Card): boolean {
   if (card.members == null) {
     return true
   }
-  const employee = (getCurrentAccount() as EmployeeAccount).employee
+  const employee = (getCurrentAccount() as PersonAccount).person
 
-  return !card.members.includes(employee)
+  return !card.members.includes(employee as Ref<Employee>)
 }
 
 export function hasCover (card: Card): boolean {
@@ -100,13 +100,13 @@ export function hasDate (card: Card): boolean {
 }
 
 export function addCurrentUser (card: Card, client: Client): Promise<TxResult> | undefined {
-  const employee = (getCurrentAccount() as EmployeeAccount).employee
+  const employee = (getCurrentAccount() as PersonAccount).person
 
-  if (card.members?.includes(employee) === true) {
+  if (card.members?.includes(employee as Ref<Employee>) === true) {
     return
   }
 
-  return client.update(card, { $push: { members: employee } })
+  return client.update(card, { $push: { members: employee as Ref<Employee> } })
 }
 
 export function archiveCard (card: Card, client: Client): Promise<TxResult> | undefined {
diff --git a/plugins/calendar-resources/src/components/CalendarView.svelte b/plugins/calendar-resources/src/components/CalendarView.svelte
index dac289284e..f14aa9099e 100644
--- a/plugins/calendar-resources/src/components/CalendarView.svelte
+++ b/plugins/calendar-resources/src/components/CalendarView.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { Calendar, Event, getAllEvents } from '@hcengineering/calendar'
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import {
     Class,
     Doc,
@@ -58,7 +58,7 @@
     CalendarMode.Year
   ]
 
-  const me = getCurrentAccount() as EmployeeAccount
+  const me = getCurrentAccount() as PersonAccount
 
   const mondayStart = true
   let mode: CalendarMode = allowedModes.includes(CalendarMode.Days) ? CalendarMode.Days : allowedModes[0]
diff --git a/plugins/calendar-resources/src/components/CreateEvent.svelte b/plugins/calendar-resources/src/components/CreateEvent.svelte
index 503b7a9665..14361313b3 100644
--- a/plugins/calendar-resources/src/components/CreateEvent.svelte
+++ b/plugins/calendar-resources/src/components/CreateEvent.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { Calendar, generateEventId } from '@hcengineering/calendar'
-  import { Employee, EmployeeAccount } from '@hcengineering/contact'
+  import { Employee, PersonAccount } from '@hcengineering/contact'
   import { UserBoxList } from '@hcengineering/contact-resources'
   import { Class, DateRangeMode, Doc, Ref, getCurrentAccount } from '@hcengineering/core'
   import { Card, getClient } from '@hcengineering/presentation'
@@ -40,8 +40,8 @@
   let dueDateRef: DateRangePresenter
   let allDay = false
 
-  const currentUser = getCurrentAccount() as EmployeeAccount
-  let participants: Ref<Employee>[] = [currentUser.employee]
+  const currentUser = getCurrentAccount() as PersonAccount
+  let participants: Ref<Employee>[] = [currentUser.person as Ref<Employee>]
 
   const dispatch = createEventDispatcher()
   const client = getClient()
diff --git a/plugins/calendar-resources/src/components/CreateReminder.svelte b/plugins/calendar-resources/src/components/CreateReminder.svelte
index a99d264b90..373699e3af 100644
--- a/plugins/calendar-resources/src/components/CreateReminder.svelte
+++ b/plugins/calendar-resources/src/components/CreateReminder.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { Calendar, Event, generateEventId } from '@hcengineering/calendar'
-  import { Employee, EmployeeAccount } from '@hcengineering/contact'
+  import { Employee, PersonAccount } from '@hcengineering/contact'
   import { UserBoxList } from '@hcengineering/contact-resources'
   import { Class, DateRangeMode, Doc, Ref, getCurrentAccount } from '@hcengineering/core'
   import { Card, getClient } from '@hcengineering/presentation'
@@ -29,8 +29,8 @@
   let _title = title
 
   let value: number | null | undefined = null
-  const currentUser = getCurrentAccount() as EmployeeAccount
-  let participants: Ref<Employee>[] = [currentUser.employee]
+  const currentUser = getCurrentAccount() as PersonAccount
+  let participants: Ref<Employee>[] = [currentUser.person as Ref<Employee>]
   const defaultDuration = 30 * 60 * 1000
 
   const dispatch = createEventDispatcher()
diff --git a/plugins/calendar-resources/src/components/DocReminder.svelte b/plugins/calendar-resources/src/components/DocReminder.svelte
index 41494a8cd1..e591139ac6 100644
--- a/plugins/calendar-resources/src/components/DocReminder.svelte
+++ b/plugins/calendar-resources/src/components/DocReminder.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { Doc, getCurrentAccount } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
   import { Button, showPopup } from '@hcengineering/ui'
@@ -34,10 +34,10 @@
     if (isEvent) {
       showPopup(SaveEventReminder, { objectId: value._id, objectClass: value._class }, ev.target as HTMLElement)
     } else {
-      const currentUser = getCurrentAccount() as EmployeeAccount
+      const currentUser = getCurrentAccount() as PersonAccount
       const current = await client.findOne(calendar.class.Event, {
         attachedTo: value._id,
-        participants: currentUser.employee
+        participants: currentUser.person
       })
       if (current === undefined) {
         showPopup(
diff --git a/plugins/calendar-resources/src/components/DocRemindersPopup.svelte b/plugins/calendar-resources/src/components/DocRemindersPopup.svelte
index 7c658e0eb2..ae00c6588a 100644
--- a/plugins/calendar-resources/src/components/DocRemindersPopup.svelte
+++ b/plugins/calendar-resources/src/components/DocRemindersPopup.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { Event } from '@hcengineering/calendar'
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { Class, Doc, getCurrentAccount, Ref } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
   import { Button, deviceOptionsStore as deviceInfo, IconAdd, Label, Scroller, showPopup } from '@hcengineering/ui'
@@ -26,14 +26,14 @@
   export let attachedToClass: Ref<Class<Doc>>
   export let title: string | undefined
 
-  const currentUser = getCurrentAccount() as EmployeeAccount
+  const currentUser = getCurrentAccount() as PersonAccount
   let events: Event[] = []
   const query = createQuery()
   $: query.query(
     calendar.class.Event,
     {
       attachedTo,
-      participants: currentUser.employee
+      participants: currentUser.person
     },
     (res) => {
       events = res.filter((p) => p.reminders !== undefined && p.reminders.length > 0)
diff --git a/plugins/calendar-resources/src/components/PersonsPresenter.svelte b/plugins/calendar-resources/src/components/PersonsPresenter.svelte
index 069bb2f5b3..a5b3bb407c 100644
--- a/plugins/calendar-resources/src/components/PersonsPresenter.svelte
+++ b/plugins/calendar-resources/src/components/PersonsPresenter.svelte
@@ -20,6 +20,7 @@
   import calendar from '../plugin'
   import { showPanel, tooltip } from '@hcengineering/ui'
   import view from '@hcengineering/view'
+  import { getClient } from '@hcengineering/presentation'
 
   export let value: Person | Person[]
   export let inline: boolean = false
@@ -30,15 +31,17 @@
   async function onClick (p: Person) {
     showPanel(view.component.EditDoc, p._id, Hierarchy.mixinOrClass(p), 'content')
   }
+  const client = getClient()
 </script>
 
 {#if value}
   <div class="flex persons">
     {#each persons as p}
+      <!-- svelte-ignore a11y-click-events-have-key-events -->
       <div
         class="flex-presenter"
         class:inline-presenter={inline}
-        use:tooltip={{ label: calendar.string.PersonsLabel, props: { name: getName(p) } }}
+        use:tooltip={{ label: calendar.string.PersonsLabel, props: { name: getName(client.getHierarchy(), p) } }}
         on:click={() => onClick(p)}
       >
         <div class="icon">
diff --git a/plugins/chunter-resources/src/backlinks.ts b/plugins/chunter-resources/src/backlinks.ts
index 7ba8ddf897..4a454da07d 100644
--- a/plugins/chunter-resources/src/backlinks.ts
+++ b/plugins/chunter-resources/src/backlinks.ts
@@ -1,13 +1,13 @@
 import { Backlink } from '@hcengineering/chunter'
-import contact, { EmployeeAccount } from '@hcengineering/contact'
+import contact, { PersonAccount } from '@hcengineering/contact'
 import { Account, Class, Client, Data, Doc, DocumentQuery, Ref, TxOperations } from '@hcengineering/core'
 import chunter from './plugin'
 
 export async function getUser (
   client: Client,
-  user: Ref<EmployeeAccount> | Ref<Account>
-): Promise<EmployeeAccount | undefined> {
-  return await client.findOne(contact.class.EmployeeAccount, { _id: user as Ref<EmployeeAccount> })
+  user: Ref<PersonAccount> | Ref<Account>
+): Promise<PersonAccount | undefined> {
+  return await client.findOne(contact.class.PersonAccount, { _id: user as Ref<PersonAccount> })
 }
 
 export function getTime (time: number): string {
diff --git a/plugins/chunter-resources/src/components/ChunterBrowser.svelte b/plugins/chunter-resources/src/components/ChunterBrowser.svelte
index 39e6fd6260..009acfd5df 100644
--- a/plugins/chunter-resources/src/components/ChunterBrowser.svelte
+++ b/plugins/chunter-resources/src/components/ChunterBrowser.svelte
@@ -43,7 +43,7 @@
         requestedSpaceClasses: [plugin.class.Channel, plugin.class.DirectMessage]
       }
     },
-    { searchType: SearchType.Contacts, component: EmployeeBrowser, filterClass: contact.class.Employee }
+    { searchType: SearchType.Contacts, component: EmployeeBrowser, filterClass: contact.mixin.Employee }
   ]
 </script>
 
diff --git a/plugins/chunter-resources/src/components/Comment.svelte b/plugins/chunter-resources/src/components/Comment.svelte
index 54d5ffbf07..22741a695a 100644
--- a/plugins/chunter-resources/src/components/Comment.svelte
+++ b/plugins/chunter-resources/src/components/Comment.svelte
@@ -15,6 +15,7 @@
 <script lang="ts">
   import { getName, Person } from '@hcengineering/contact'
   import { Avatar } from '@hcengineering/contact-resources'
+  import { getClient } from '@hcengineering/presentation'
 
   interface IMessage {
     text: string
@@ -23,12 +24,13 @@
 
   export let user: Person
   export let message: IMessage
+  const client = getClient()
 </script>
 
 <div class="flex-nowrap">
   <div class="avatar"><Avatar size={'medium'} /></div>
   <div class="flex-col-stretch message">
-    <div class="header">{getName(user)}<span>{message.createDate}</span></div>
+    <div class="header">{getName(client.getHierarchy(), user)}<span>{message.createDate}</span></div>
     <div class="text">{message.text}</div>
   </div>
 </div>
diff --git a/plugins/chunter-resources/src/components/CommentPresenter.svelte b/plugins/chunter-resources/src/components/CommentPresenter.svelte
index 3d27d4402d..583a76dfc3 100644
--- a/plugins/chunter-resources/src/components/CommentPresenter.svelte
+++ b/plugins/chunter-resources/src/components/CommentPresenter.svelte
@@ -17,10 +17,10 @@
   import { AttachmentDocList } from '@hcengineering/attachment-resources'
   import type { Comment } from '@hcengineering/chunter'
   import chunter from '@hcengineering/chunter'
-  import { Employee, EmployeeAccount, getName } from '@hcengineering/contact'
-  import { Avatar, employeeAccountByIdStore, employeeByIdStore } from '@hcengineering/contact-resources'
+  import { Person, PersonAccount, getName } from '@hcengineering/contact'
+  import { Avatar, personByIdStore, personAccountByIdStore } from '@hcengineering/contact-resources'
   import { IdMap, Ref } from '@hcengineering/core'
-  import { MessageViewer } from '@hcengineering/presentation'
+  import { MessageViewer, getClient } from '@hcengineering/presentation'
   import { Icon, ShowMore, TimeSince } from '@hcengineering/ui'
   import { LinkPresenter } from '@hcengineering/view-resources'
 
@@ -28,18 +28,20 @@
   export let inline: boolean = false
   export let disabled = false
 
+  const client = getClient()
+
   const cutId = (str: string): string => {
     return str.slice(0, 4) + '...' + str.slice(-4)
   }
 
   async function getEmployee (
     value: Comment,
-    employees: IdMap<Employee>,
-    accounts: IdMap<EmployeeAccount>
-  ): Promise<Employee | undefined> {
-    const acc = accounts.get(value.modifiedBy as Ref<EmployeeAccount>)
+    employees: IdMap<Person>,
+    accounts: IdMap<PersonAccount>
+  ): Promise<Person | undefined> {
+    const acc = accounts.get(value.modifiedBy as Ref<PersonAccount>)
     if (acc !== undefined) {
-      const emp = employees.get(acc.employee)
+      const emp = employees.get(acc.person)
       return emp
     }
   }
@@ -76,14 +78,14 @@
   &nbsp;<span class="content-dark-color">#{cutId(value._id.toString())}</span>
 {:else}
   <div class="flex-row-top">
-    {#await getEmployee(value, $employeeByIdStore, $employeeAccountByIdStore) then employee}
+    {#await getEmployee(value, $personByIdStore, $personAccountByIdStore) then employee}
       <div class="avatar">
         <Avatar size={'medium'} avatar={employee?.avatar} />
       </div>
       <div class="flex-grow flex-col select-text">
         <div class="header">
           <div class="fs-title">
-            {#if employee}{getName(employee)}{/if}
+            {#if employee}{getName(client.getHierarchy(), employee)}{/if}
           </div>
           <div class="content-dark-color ml-4"><TimeSince value={value.modifiedOn} /></div>
         </div>
diff --git a/plugins/chunter-resources/src/components/CreateDirectMessage.svelte b/plugins/chunter-resources/src/components/CreateDirectMessage.svelte
index d83d469316..8da43ff1b8 100644
--- a/plugins/chunter-resources/src/components/CreateDirectMessage.svelte
+++ b/plugins/chunter-resources/src/components/CreateDirectMessage.svelte
@@ -32,7 +32,7 @@
   let employeeIds: Ref<Employee>[] = []
 
   async function createDirectMessage () {
-    const employeeAccounts = await client.findAll(contact.class.EmployeeAccount, { employee: { $in: employeeIds } })
+    const employeeAccounts = await client.findAll(contact.class.PersonAccount, { person: { $in: employeeIds } })
 
     const accIds = [myAccId, ...employeeAccounts.filter((ea) => ea._id !== myAccId).map((ea) => ea._id)].sort()
     const existingDms = await client.findAll(chunter.class.DirectMessage, {})
diff --git a/plugins/chunter-resources/src/components/DmHeader.svelte b/plugins/chunter-resources/src/components/DmHeader.svelte
index b0fbc445a8..fe5c7036d0 100644
--- a/plugins/chunter-resources/src/components/DmHeader.svelte
+++ b/plugins/chunter-resources/src/components/DmHeader.svelte
@@ -18,7 +18,7 @@
   import { getCurrentAccount } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { CombineAvatars } from '@hcengineering/contact-resources'
-  import contact, { EmployeeAccount } from '@hcengineering/contact'
+  import contact, { PersonAccount } from '@hcengineering/contact'
   import { SearchEdit, showPanel } from '@hcengineering/ui'
   import chunter from '../plugin'
   import { getDmName, navigateToSpecial } from '../utils'
@@ -42,11 +42,11 @@
   async function getEmpolyeeIds () {
     const empAccIds = dm?.members.length !== 1 ? dm?.members.filter((accId) => accId !== myAccId) : dm?.members
 
-    const employeeAccounts = await client.findAll(contact.class.EmployeeAccount, {
-      _id: { $in: empAccIds as Ref<EmployeeAccount>[] }
+    const employeeAccounts = await client.findAll(contact.class.PersonAccount, {
+      _id: { $in: empAccIds as Ref<PersonAccount>[] }
     })
 
-    return employeeAccounts.map((ea) => ea.employee)
+    return employeeAccounts.map((ea) => ea.person)
   }
 
   async function onSpaceEdit (): Promise<void> {
@@ -62,7 +62,7 @@
         <!-- svelte-ignore a11y-click-events-have-key-events -->
         <div class="ac-header__wrap-title" on:click={onSpaceEdit}>
           <div class="ac-header__icon">
-            <CombineAvatars _class={contact.class.Employee} items={empolyeeIds} size={'x-small'} />
+            <CombineAvatars _class={contact.mixin.Employee} items={empolyeeIds} size={'x-small'} />
           </div>
           <span class="ac-header__title">{name}</span>
         </div>
diff --git a/plugins/chunter-resources/src/components/Message.svelte b/plugins/chunter-resources/src/components/Message.svelte
index 08a8522bce..a81e7fc38f 100644
--- a/plugins/chunter-resources/src/components/Message.svelte
+++ b/plugins/chunter-resources/src/components/Message.svelte
@@ -16,8 +16,8 @@
   import { Attachment } from '@hcengineering/attachment'
   import { AttachmentList, AttachmentRefInput } from '@hcengineering/attachment-resources'
   import type { ChunterMessage, Message, Reaction } from '@hcengineering/chunter'
-  import { EmployeeAccount } from '@hcengineering/contact'
-  import { Avatar, employeeByIdStore, EmployeePresenter } from '@hcengineering/contact-resources'
+  import { PersonAccount } from '@hcengineering/contact'
+  import { Avatar, personByIdStore, EmployeePresenter } from '@hcengineering/contact-resources'
   import { getCurrentAccount, Ref, WithLookup } from '@hcengineering/core'
   import { getResource } from '@hcengineering/platform'
   import { getClient, MessageViewer } from '@hcengineering/presentation'
@@ -46,8 +46,8 @@
 
   let refInput: AttachmentRefInput
 
-  $: empRef = (message.$lookup?.createBy as EmployeeAccount)?.employee
-  $: employee = empRef !== undefined ? $employeeByIdStore.get(empRef) : undefined
+  $: empRef = (message.$lookup?.createBy as PersonAccount)?.person
+  $: employee = empRef !== undefined ? $personByIdStore.get(empRef) : undefined
   $: attachments = (message.$lookup?.attachments ?? []) as Attachment[]
 
   const client = getClient()
diff --git a/plugins/chunter-resources/src/components/PinnedMessagesPopup.svelte b/plugins/chunter-resources/src/components/PinnedMessagesPopup.svelte
index 657c6b872a..5bfddf5107 100644
--- a/plugins/chunter-resources/src/components/PinnedMessagesPopup.svelte
+++ b/plugins/chunter-resources/src/components/PinnedMessagesPopup.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
   import chunter, { ChunterMessage } from '@hcengineering/chunter'
-  import { Employee, EmployeeAccount, getName } from '@hcengineering/contact'
-  import { Avatar, employeeAccountByIdStore, employeeByIdStore } from '@hcengineering/contact-resources'
+  import { Person, PersonAccount, getName } from '@hcengineering/contact'
+  import { Avatar, personAccountByIdStore, personByIdStore } from '@hcengineering/contact-resources'
   import { IdMap, Ref, Space } from '@hcengineering/core'
-  import { MessageViewer, createQuery } from '@hcengineering/presentation'
+  import { MessageViewer, createQuery, getClient } from '@hcengineering/presentation'
   import { IconClose } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import { UnpinMessage } from '../index'
@@ -11,6 +11,8 @@
 
   export let space: Ref<Space>
 
+  const client = getClient()
+
   const pinnedQuery = createQuery()
   let pinnedIds: Ref<ChunterMessage>[] = []
   pinnedQuery.query(
@@ -34,27 +36,28 @@
 
   function getEmployee (
     message: ChunterMessage,
-    employeeAccounts: IdMap<EmployeeAccount>,
-    employees: IdMap<Employee>
-  ): Employee | undefined {
-    const acc = employeeAccounts.get(message.createBy as Ref<EmployeeAccount>)
+    employeeAccounts: IdMap<PersonAccount>,
+    employees: IdMap<Person>
+  ): Person | undefined {
+    const acc = employeeAccounts.get(message.createBy as Ref<PersonAccount>)
     if (acc) {
-      return employees.get(acc.employee)
+      return employees.get(acc.person)
     }
   }
 </script>
 
 <div class="antiPopup vScroll popup">
   {#each pinnedMessages as message}
-    {@const employee = getEmployee(message, $employeeAccountByIdStore, $employeeByIdStore)}
+    {@const employee = getEmployee(message, $personAccountByIdStore, $personByIdStore)}
     <div class="message">
       <div class="header">
         <div class="avatar">
           <Avatar size={'medium'} avatar={employee?.avatar} />
         </div>
         <span class="name">
-          {employee ? getName(employee) : ''}
+          {employee ? getName(client.getHierarchy(), employee) : ''}
         </span>
+        <!-- svelte-ignore a11y-click-events-have-key-events -->
         <div
           class="cross"
           on:click={async () => {
diff --git a/plugins/chunter-resources/src/components/ReactionsTooltip.svelte b/plugins/chunter-resources/src/components/ReactionsTooltip.svelte
index 1785810098..1d46a32a1d 100644
--- a/plugins/chunter-resources/src/components/ReactionsTooltip.svelte
+++ b/plugins/chunter-resources/src/components/ReactionsTooltip.svelte
@@ -1,15 +1,17 @@
 <script lang="ts">
-  import { Employee, EmployeeAccount, getName } from '@hcengineering/contact'
-  import { employeeAccountByIdStore, employeeByIdStore } from '@hcengineering/contact-resources'
+  import { Person, PersonAccount, getName } from '@hcengineering/contact'
+  import { personAccountByIdStore, personByIdStore } from '@hcengineering/contact-resources'
   import { Account, IdMap, Ref } from '@hcengineering/core'
+  import { getClient } from '@hcengineering/presentation'
 
   export let reactionAccounts: Ref<Account>[]
 
-  function getAccName (acc: Ref<Account>, accounts: IdMap<EmployeeAccount>, employees: IdMap<Employee>): string {
-    const account = accounts.get(acc as Ref<EmployeeAccount>)
+  const client = getClient()
+  function getAccName (acc: Ref<Account>, accounts: IdMap<PersonAccount>, employees: IdMap<Person>): string {
+    const account = accounts.get(acc as Ref<PersonAccount>)
     if (account !== undefined) {
-      const emp = employees.get(account.employee)
-      return emp ? getName(emp) : ''
+      const emp = employees.get(account.person)
+      return emp ? getName(client.getHierarchy(), emp) : ''
     }
     return ''
   }
@@ -17,6 +19,6 @@
 
 {#each reactionAccounts as acc}
   <div>
-    {getAccName(acc, $employeeAccountByIdStore, $employeeByIdStore)}
+    {getAccName(acc, $personAccountByIdStore, $personByIdStore)}
   </div>
 {/each}
diff --git a/plugins/chunter-resources/src/components/Replies.svelte b/plugins/chunter-resources/src/components/Replies.svelte
index 390b700215..0b0e3bf61b 100644
--- a/plugins/chunter-resources/src/components/Replies.svelte
+++ b/plugins/chunter-resources/src/components/Replies.svelte
@@ -14,8 +14,8 @@
 -->
 <script lang="ts">
   import { Message } from '@hcengineering/chunter'
-  import { Employee } from '@hcengineering/contact'
-  import { employeeByIdStore } from '@hcengineering/contact-resources'
+  import { Person } from '@hcengineering/contact'
+  import { personByIdStore } from '@hcengineering/contact-resources'
   import { IdMap, Ref } from '@hcengineering/core'
   import { Avatar } from '@hcengineering/contact-resources'
   import { Label, TimeSince } from '@hcengineering/ui'
@@ -26,11 +26,11 @@
   $: employees = new Set(message.replies)
 
   const shown: number = 4
-  let showReplies: Employee[] = []
+  let showReplies: Person[] = []
 
-  $: updateQuery(employees, $employeeByIdStore)
+  $: updateQuery(employees, $personByIdStore)
 
-  function updateQuery (employees: Set<Ref<Employee>>, map: IdMap<Employee>) {
+  function updateQuery (employees: Set<Ref<Person>>, map: IdMap<Person>) {
     showReplies = []
     for (const employee of employees) {
       const emp = map.get(employee)
diff --git a/plugins/chunter-resources/src/components/SavedMessages.svelte b/plugins/chunter-resources/src/components/SavedMessages.svelte
index 549157b991..95939324d9 100644
--- a/plugins/chunter-resources/src/components/SavedMessages.svelte
+++ b/plugins/chunter-resources/src/components/SavedMessages.svelte
@@ -2,8 +2,8 @@
   import attachment, { Attachment } from '@hcengineering/attachment'
   import { AttachmentPreview } from '@hcengineering/attachment-resources'
   import { ChunterMessage } from '@hcengineering/chunter'
-  import { EmployeeAccount, getName as getContactName } from '@hcengineering/contact'
-  import { employeeAccountByIdStore, employeeByIdStore } from '@hcengineering/contact-resources'
+  import { Person, PersonAccount, getName as getContactName } from '@hcengineering/contact'
+  import { personAccountByIdStore, personByIdStore } from '@hcengineering/contact-resources'
   import core, { IdMap, Ref, WithLookup } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { Label, Scroller } from '@hcengineering/ui'
@@ -74,12 +74,16 @@
     })
   }
 
-  function getName (a: Attachment, employeeAccountByIdStore: IdMap<EmployeeAccount>): string | undefined {
-    const acc = employeeAccountByIdStore.get(a.modifiedBy as Ref<EmployeeAccount>)
+  function getName (
+    a: Attachment,
+    personAccountByIdStore: IdMap<PersonAccount>,
+    personByIdStore: IdMap<Person>
+  ): string | undefined {
+    const acc = personAccountByIdStore.get(a.modifiedBy as Ref<PersonAccount>)
     if (acc !== undefined) {
-      const emp = $employeeByIdStore.get(acc?.employee)
+      const emp = personByIdStore.get(acc?.person)
       if (emp !== undefined) {
-        return getContactName(emp)
+        return getContactName(client.getHierarchy(), emp)
       }
     }
   }
@@ -112,7 +116,7 @@
         <div class="label">
           <Label
             label={chunter.string.SharedBy}
-            params={{ name: getName(att, $employeeAccountByIdStore), time: getTime(att.modifiedOn) }}
+            params={{ name: getName(att, $personAccountByIdStore, $personByIdStore), time: getTime(att.modifiedOn) }}
           />
         </div>
       </div>
diff --git a/plugins/chunter-resources/src/components/Thread.svelte b/plugins/chunter-resources/src/components/Thread.svelte
index f678122637..465f7ed290 100644
--- a/plugins/chunter-resources/src/components/Thread.svelte
+++ b/plugins/chunter-resources/src/components/Thread.svelte
@@ -16,8 +16,8 @@
   import attachment, { Attachment } from '@hcengineering/attachment'
   import { AttachmentRefInput } from '@hcengineering/attachment-resources'
   import type { ChunterSpace, Message, ThreadMessage } from '@hcengineering/chunter'
-  import contact, { Employee, EmployeeAccount, getName } from '@hcengineering/contact'
-  import { employeeByIdStore } from '@hcengineering/contact-resources'
+  import contact, { Person, PersonAccount, getName } from '@hcengineering/contact'
+  import { personByIdStore } from '@hcengineering/contact-resources'
   import core, { FindOptions, IdMap, Ref, SortingOrder, generateId, getCurrentAccount } from '@hcengineering/core'
   import { NotificationClientImpl } from '@hcengineering/notification-resources'
   import { createQuery, getClient } from '@hcengineering/presentation'
@@ -98,21 +98,21 @@
   async function getParticipants (
     comments: ThreadMessage[],
     parent: Message | undefined,
-    employees: IdMap<Employee>
+    employees: IdMap<Person>
   ): Promise<string[]> {
     const refs = new Set(comments.map((p) => p.createBy))
     if (parent !== undefined) {
       refs.add(parent.createBy)
     }
     refs.delete(getCurrentAccount()._id)
-    const accounts = await client.findAll(contact.class.EmployeeAccount, {
-      _id: { $in: Array.from(refs) as Ref<EmployeeAccount>[] }
+    const accounts = await client.findAll(contact.class.PersonAccount, {
+      _id: { $in: Array.from(refs) as Ref<PersonAccount>[] }
     })
     const res: string[] = []
     for (const account of accounts) {
-      const employee = employees.get(account.employee)
+      const employee = employees.get(account.person)
       if (employee !== undefined) {
-        res.push(getName(employee))
+        res.push(getName(client.getHierarchy(), employee))
       }
     }
     return res
@@ -159,7 +159,7 @@
         <DmPresenter value={channel} />
       {/if}
     {/await}
-    {#await getParticipants(comments, parent, $employeeByIdStore) then participants}
+    {#await getParticipants(comments, parent, $personByIdStore) then participants}
       {participants.join(', ')}
       <Label label={chunter.string.AndYou} params={{ participants: participants.length }} />
     {/await}
diff --git a/plugins/chunter-resources/src/utils.ts b/plugins/chunter-resources/src/utils.ts
index 1c13c7d347..9d62410e42 100644
--- a/plugins/chunter-resources/src/utils.ts
+++ b/plugins/chunter-resources/src/utils.ts
@@ -1,5 +1,5 @@
 import { chunterId, ChunterMessage, Comment, ThreadMessage } from '@hcengineering/chunter'
-import contact, { Employee, EmployeeAccount, getName } from '@hcengineering/contact'
+import contact, { Employee, PersonAccount, getName } from '@hcengineering/contact'
 import { employeeByIdStore } from '@hcengineering/contact-resources'
 import { Class, Client, Doc, getCurrentAccount, IdMap, Obj, Ref, Space, Timestamp } from '@hcengineering/core'
 import { Asset } from '@hcengineering/platform'
@@ -48,8 +48,8 @@ export function classIcon (client: Client, _class: Ref<Class<Obj>>): Asset | und
 export async function getDmName (client: Client, dm: Space): Promise<string> {
   const myAccId = getCurrentAccount()._id
 
-  let employeeAccounts: EmployeeAccount[] = await client.findAll(contact.class.EmployeeAccount, {
-    _id: { $in: dm.members as Array<Ref<EmployeeAccount>> }
+  let employeeAccounts: PersonAccount[] = await client.findAll(contact.class.PersonAccount, {
+    _id: { $in: dm.members as Array<Ref<PersonAccount>> }
   })
 
   if (dm.members.length > 1) {
@@ -72,9 +72,9 @@ export async function getDmName (client: Client, dm: Space): Promise<string> {
   const names: string[] = []
 
   for (const acc of employeeAccounts) {
-    const employee = map.get(acc.employee)
+    const employee = map.get(acc.person as unknown as Ref<Employee>)
     if (employee !== undefined) {
-      names.push(getName(employee))
+      names.push(getName(client.getHierarchy(), employee))
     }
   }
   const name = names.join(', ')
diff --git a/plugins/chunter/src/index.ts b/plugins/chunter/src/index.ts
index e5f6ddb16b..d331b9e298 100644
--- a/plugins/chunter/src/index.ts
+++ b/plugins/chunter/src/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import type { Employee } from '@hcengineering/contact'
+import type { Person } from '@hcengineering/contact'
 import type { Account, AttachedDoc, Class, Doc, Ref, RelatedDocument, Space, Timestamp } from '@hcengineering/core'
 import { NotificationType } from '@hcengineering/notification'
 import type { Asset, Plugin, Resource } from '@hcengineering/platform'
@@ -66,7 +66,7 @@ export interface ThreadMessage extends ChunterMessage {
 export interface Message extends ChunterMessage {
   attachedTo: Ref<Space>
   attachedToClass: Ref<Class<Space>>
-  replies?: Ref<Employee>[]
+  replies?: Ref<Person>[]
   repliesCount?: number
   lastReply?: Timestamp
 }
diff --git a/plugins/contact-assets/lang/en.json b/plugins/contact-assets/lang/en.json
index d49d92c763..ee53b431f5 100644
--- a/plugins/contact-assets/lang/en.json
+++ b/plugins/contact-assets/lang/en.json
@@ -67,6 +67,7 @@
     "Email": "Email",
     "CreateEmployee": "Employee",
     "Inactive": "Inactive",
+    "Active": "Active",
     "Birthday": "Birthday",
     "UseImage": "Attached photo",
     "UseGravatar": "Gravatar",
@@ -79,9 +80,9 @@
     "Profile": "Profile",
     "ProfilePlaceholder": "Profile...",
     "CurrentEmployee": "Current employee",
-    "MergeEmployee": "Merge employee",
-    "MergeEmployeeFrom": "From(inactive)",
-    "MergeEmployeeTo": "To employee",
+    "MergePersons": "Merge contacts",
+    "MergePersonsFrom": "Source contact",
+    "MergePersonsTo": "Final contact",
     "DisplayName": "Display name",
     "SelectAvatar": "Select avatar",
     "AvatarProvider": "Avatar provider",
diff --git a/plugins/contact-assets/lang/ru.json b/plugins/contact-assets/lang/ru.json
index fcb9f9a843..dad2451c44 100644
--- a/plugins/contact-assets/lang/ru.json
+++ b/plugins/contact-assets/lang/ru.json
@@ -67,6 +67,7 @@
     "Email": "Email",
     "CreateEmployee": "Сотрудник",
     "Inactive": "Не активный",
+    "Active": "Активный",
     "Birthday": "День рождения",
     "UseImage": "Загруженное Фото",
     "UseGravatar": "Граватар",
@@ -80,9 +81,9 @@
     "Profile": "Профиль",
     "ProfilePlaceholder": "Профиль...",
     "CurrentEmployee": "Текущий сотрудник",
-    "MergeEmployee": "Объединить сотрудника",
-    "MergeEmployeeFrom": "Из (неактивный)",
-    "MergeEmployeeTo": "В сотрудника",
+    "MergePersons": "Объеденить контакта",
+    "MergePersonsFrom": "Исходный контакт",
+    "MergePersonsTo": "Финальный контакт",
     "DisplayName": "Отображаемое имя",
     "SelectAvatar": "Выбрать аватар",
     "GravatarsManaged": "Граватары управляются",
diff --git a/plugins/contact-resources/src/components/AccountArrayEditor.svelte b/plugins/contact-resources/src/components/AccountArrayEditor.svelte
index 4caaf1b5cd..8de6c8c7e4 100644
--- a/plugins/contact-resources/src/components/AccountArrayEditor.svelte
+++ b/plugins/contact-resources/src/components/AccountArrayEditor.svelte
@@ -13,12 +13,12 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { Employee, EmployeeAccount } from '@hcengineering/contact'
+  import contact, { Employee, PersonAccount } from '@hcengineering/contact'
   import core, { Account, Ref } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { ButtonKind, ButtonSize } from '@hcengineering/ui'
-  import { employeeAccountByIdStore } from '../utils'
+  import { personAccountByIdStore } from '../utils'
   import UserBoxList from './UserBoxList.svelte'
 
   export let label: IntlString
@@ -36,7 +36,7 @@
   function onUpdate (evt: CustomEvent<Ref<Employee>[]>): void {
     clearTimeout(timer)
     timer = setTimeout(async () => {
-      const accounts = await client.findAll(contact.class.EmployeeAccount, { employee: { $in: evt.detail } })
+      const accounts = await client.findAll(contact.class.PersonAccount, { person: { $in: evt.detail } })
       onChange(accounts.map((it) => it._id))
     }, 500)
   }
@@ -55,14 +55,14 @@
   }
 
   $: employees = Array.from(
-    (value ?? []).map((it) => $employeeAccountByIdStore.get(it as Ref<EmployeeAccount>)?.employee)
+    (value ?? []).map((it) => $personAccountByIdStore.get(it as Ref<PersonAccount>)?.person)
   ).filter((it) => it !== undefined) as Ref<Employee>[]
 
   $: docQuery =
     excluded.length > 0
       ? {
           active: true,
-          _id: { $nin: excluded.map((p) => (p as EmployeeAccount).employee) }
+          _id: { $nin: excluded.map((p) => (p as PersonAccount).person as Ref<Employee>) }
         }
       : {
           active: true
diff --git a/plugins/contact-resources/src/components/AccountBox.svelte b/plugins/contact-resources/src/components/AccountBox.svelte
index bb0162e9c1..440095d80d 100644
--- a/plugins/contact-resources/src/components/AccountBox.svelte
+++ b/plugins/contact-resources/src/components/AccountBox.svelte
@@ -13,13 +13,13 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Employee, EmployeeAccount } from '@hcengineering/contact'
+  import { Person, PersonAccount } from '@hcengineering/contact'
   import core, { Account, DocumentQuery, Ref, matchQuery } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import { ButtonKind, ButtonSize } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import contact from '../plugin'
-  import { employeeAccountByIdStore } from '../utils'
+  import { personAccountByIdStore } from '../utils'
   import UserBox from './UserBox.svelte'
   import { getClient } from '@hcengineering/presentation'
 
@@ -33,21 +33,21 @@
   const client = getClient()
   const hierarchy = client.getHierarchy()
   $: accounts = matchQuery<Account>(
-    Array.from($employeeAccountByIdStore.values()),
+    Array.from($personAccountByIdStore.values()),
     docQuery,
     core.class.Account,
     hierarchy
-  ) as EmployeeAccount[]
+  ) as PersonAccount[]
 
-  let map: Map<Ref<Employee>, Ref<Account>> = new Map()
-  $: map = new Map(accounts.map((p) => [p.employee, p._id]))
+  let map: Map<Ref<Person>, Ref<Account>> = new Map()
+  $: map = new Map(accounts.map((p) => [p.person, p._id]))
 
-  $: employees = accounts.map((p) => p.employee)
-  $: selectedEmp = value && accounts.find((p) => p._id === value)?.employee
+  $: employees = accounts.map((p) => p.person)
+  $: selectedEmp = value && accounts.find((p) => p._id === value)?.person
 
   const dispatch = createEventDispatcher()
 
-  function change (e: CustomEvent<Ref<Employee> | null>) {
+  function change (e: CustomEvent<Ref<Person> | null>) {
     if (e.detail === null) {
       dispatch('change', null)
     } else {
@@ -58,7 +58,7 @@
 </script>
 
 <UserBox
-  _class={contact.class.Employee}
+  _class={contact.mixin.Employee}
   docQuery={{ _id: { $in: employees } }}
   showNavigate={false}
   {kind}
diff --git a/plugins/contact-resources/src/components/AddMembersPopup.svelte b/plugins/contact-resources/src/components/AddMembersPopup.svelte
index f676ed635c..241c207a51 100644
--- a/plugins/contact-resources/src/components/AddMembersPopup.svelte
+++ b/plugins/contact-resources/src/components/AddMembersPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Employee, EmployeeAccount, getName } from '@hcengineering/contact'
+  import { Person, PersonAccount, getName } from '@hcengineering/contact'
   import core, { IdMap, Ref, Space } from '@hcengineering/core'
   import presentation, { getClient } from '@hcengineering/presentation'
   import { ActionIcon, Button, IconClose, Label } from '@hcengineering/ui'
@@ -11,19 +11,17 @@
   const dispatch = createEventDispatcher()
   const client = getClient()
 
-  const employees: IdMap<Employee> = new Map()
+  const employees: IdMap<Person> = new Map()
 
-  let membersToAdd: EmployeeAccount[] = []
-  let channelMembers: Ref<Employee>[] = []
+  let membersToAdd: PersonAccount[] = []
+  let channelMembers: Ref<Person>[] = []
   client.findAll(core.class.Account, { _id: { $in: value.members } }).then((res) => {
-    channelMembers = res
-      .filter((e) => e._class === contact.class.EmployeeAccount)
-      .map((e) => (e as EmployeeAccount).employee)
+    channelMembers = res.filter((e) => e._class === contact.class.PersonAccount).map((e) => (e as PersonAccount).person)
   })
 
-  async function changeMembersToAdd (employees: Ref<Employee>[]) {
+  async function changeMembersToAdd (employees: Ref<Person>[]) {
     if (employees) {
-      await client.findAll(contact.class.EmployeeAccount, { employee: { $in: employees } }).then((res) => {
+      await client.findAll(contact.class.PersonAccount, { person: { $in: employees } }).then((res) => {
         if (res) {
           membersToAdd = res
         }
@@ -31,9 +29,9 @@
     }
   }
 
-  $: selectedEmployees = membersToAdd.map((e) => e.employee)
+  $: selectedEmployees = membersToAdd.map((e) => e.person)
 
-  function removeMember (_id: Ref<EmployeeAccount>) {
+  function removeMember (_id: Ref<PersonAccount>) {
     membersToAdd = membersToAdd.filter((m) => m._id !== _id)
   }
 </script>
@@ -56,9 +54,9 @@
   {#if membersToAdd.length}
     <div class="flex-row-top flex-wrap ml-6 mr-6 mt-4">
       {#each membersToAdd as m}
-        {@const employee = employees.get(m.employee)}
+        {@const employee = employees.get(m.person)}
         <div class="mr-2 p-1 item">
-          {employee ? getName(employee) : ''}
+          {employee ? getName(client.getHierarchy(), employee) : ''}
           <div class="tool">
             <ActionIcon
               icon={IconClose}
@@ -75,7 +73,7 @@
   <div class="ml-8 mr-8 mb-6 mt-4">
     <UsersPopup
       selected={undefined}
-      _class={contact.class.Employee}
+      _class={contact.mixin.Employee}
       docQuery={{
         active: true
       }}
diff --git a/plugins/contact-resources/src/components/AssigneeBox.svelte b/plugins/contact-resources/src/components/AssigneeBox.svelte
index e33aa8fd92..d01bded575 100644
--- a/plugins/contact-resources/src/components/AssigneeBox.svelte
+++ b/plugins/contact-resources/src/components/AssigneeBox.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { Contact, Employee, getName } from '@hcengineering/contact'
+  import contact, { Contact, Employee, Person, getName } from '@hcengineering/contact'
   import { Class, DocumentQuery, FindOptions, Hierarchy, Ref } from '@hcengineering/core'
   import { getEmbeddedLabel, IntlString } from '@hcengineering/platform'
   import {
@@ -34,13 +34,13 @@
   import view from '@hcengineering/view'
   import { createEventDispatcher } from 'svelte'
   import presentation, { getClient } from '@hcengineering/presentation'
-  import { PersonLabelTooltip, employeeByIdStore } from '..'
+  import { PersonLabelTooltip, personByIdStore } from '..'
   import AssigneePopup from './AssigneePopup.svelte'
   import IconPerson from './icons/Person.svelte'
   import UserInfo from './UserInfo.svelte'
   import EmployeePresenter from './EmployeePresenter.svelte'
 
-  export let _class: Ref<Class<Employee>> = contact.class.Employee
+  export let _class: Ref<Class<Employee>> = contact.mixin.Employee
   export let excluded: Ref<Contact>[] | undefined = undefined
   export let options: FindOptions<Employee> | undefined = undefined
   export let docQuery: DocumentQuery<Employee> | undefined = {
@@ -48,8 +48,8 @@
   }
   export let label: IntlString
   export let placeholder: IntlString = presentation.string.Search
-  export let value: Ref<Employee> | null | undefined
-  export let prevAssigned: Ref<Employee>[] | undefined = []
+  export let value: Ref<Person> | null | undefined
+  export let prevAssigned: Ref<Person>[] | undefined = []
   export let componentLead: Ref<Employee> | undefined = undefined
   export let members: Ref<Employee>[] | undefined = []
   export let allowDeselect = true
@@ -71,13 +71,15 @@
 
   const dispatch = createEventDispatcher()
 
-  let selected: Employee | undefined
+  let selected: Person | undefined
   let container: HTMLElement
 
   const client = getClient()
 
-  async function updateSelected (value: Ref<Employee> | null | undefined) {
-    selected = value ? $employeeByIdStore.get(value) ?? (await client.findOne(_class, { _id: value })) : undefined
+  async function updateSelected (value: Ref<Person> | null | undefined) {
+    selected = value
+      ? $personByIdStore.get(value) ?? (await client.findOne(contact.class.Person, { _id: value }))
+      : undefined
   }
 
   $: updateSelected(value)
@@ -132,7 +134,9 @@
     <div
       class="w-full h-full flex-streatch"
       on:click={_click}
-      use:tooltip={selected !== undefined ? { label: getEmbeddedLabel(getName(selected)) } : undefined}
+      use:tooltip={selected !== undefined
+        ? { label: getEmbeddedLabel(getName(client.getHierarchy(), selected)) }
+        : undefined}
     >
       <slot name="content" />
     </div>
@@ -158,13 +162,15 @@
           style:width={showNavigate && selected
             ? `calc(${width ?? 'min-content'} - 1.5rem)`
             : `${width ?? 'min-content'}`}
-          use:tooltip={selected !== undefined ? { label: getEmbeddedLabel(getName(selected)) } : undefined}
+          use:tooltip={selected !== undefined
+            ? { label: getEmbeddedLabel(getName(client.getHierarchy(), selected)) }
+            : undefined}
         >
           {#if selected}
             {#if hideIcon || selected}
               <UserInfo value={selected} size={avatarSize} {icon} {short} on:accent-color />
             {:else}
-              {getName(selected)}
+              {getName(client.getHierarchy(), selected)}
             {/if}
           {:else}
             <div class="flex-presenter not-selected">
diff --git a/plugins/contact-resources/src/components/AssigneePopup.svelte b/plugins/contact-resources/src/components/AssigneePopup.svelte
index 34b24d7675..549eb7a933 100644
--- a/plugins/contact-resources/src/components/AssigneePopup.svelte
+++ b/plugins/contact-resources/src/components/AssigneePopup.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { Contact, Employee, EmployeeAccount, Person } from '@hcengineering/contact'
+  import contact, { Contact, PersonAccount, Person, Employee } from '@hcengineering/contact'
   import { DocumentQuery, FindOptions, getCurrentAccount, Ref } from '@hcengineering/core'
   import type { Asset, IntlString } from '@hcengineering/platform'
   import {
@@ -52,9 +52,7 @@
   export let showCategories: boolean = true
   export let icon: Asset | AnySvelteComponent | undefined = undefined
 
-  // const client = getClient()
-  // const hierarchy = client.getHierarchy()
-  const currentEmployee = (getCurrentAccount() as EmployeeAccount).employee
+  const currentEmployee = (getCurrentAccount() as PersonAccount).person
 
   let search: string = ''
   let objects: Contact[] = []
@@ -66,7 +64,7 @@
   const query = createQuery()
 
   $: query.query<Contact>(
-    contact.class.Employee,
+    contact.mixin.Employee,
     {
       ...(docQuery ?? {}),
       [searchField]: { $like: '%' + search + '%' },
diff --git a/plugins/contact-resources/src/components/ContactList.svelte b/plugins/contact-resources/src/components/ContactList.svelte
index 905b384264..b124566da2 100644
--- a/plugins/contact-resources/src/components/ContactList.svelte
+++ b/plugins/contact-resources/src/components/ContactList.svelte
@@ -28,9 +28,7 @@
   export let items: Ref<Contact>[] = []
   export let _class: Ref<Class<Contact>> = contact.class.Contact
   export let label: IntlString
-  export let docQuery: DocumentQuery<Contact> | undefined = {
-    active: true
-  }
+  export let docQuery: DocumentQuery<Contact> | undefined = {}
 
   export let kind: ButtonKind = 'no-border'
   export let size: ButtonSize = 'small'
diff --git a/plugins/contact-resources/src/components/ContactPresenter.svelte b/plugins/contact-resources/src/components/ContactPresenter.svelte
index 18edd6840e..d24e097215 100644
--- a/plugins/contact-resources/src/components/ContactPresenter.svelte
+++ b/plugins/contact-resources/src/components/ContactPresenter.svelte
@@ -38,7 +38,7 @@
   function isEmployee (value: Contact): boolean {
     const client = getClient()
     const hierarchy = client.getHierarchy()
-    return hierarchy.isDerived(value._class, contact.class.Employee)
+    return hierarchy.isDerived(value._class, contact.mixin.Employee)
   }
   const toOrg = (contact: Contact) => contact as Organization
   const toEmployee = (contact: Contact) => contact as Employee
diff --git a/plugins/contact-resources/src/components/CreateEmployee.svelte b/plugins/contact-resources/src/components/CreateEmployee.svelte
index d167d1f4e2..8881a3ddc2 100644
--- a/plugins/contact-resources/src/components/CreateEmployee.svelte
+++ b/plugins/contact-resources/src/components/CreateEmployee.svelte
@@ -48,20 +48,22 @@
   async function createPerson () {
     changeEmail()
     const name = combineName(firstName, lastName)
-    const person: Data<Employee> = {
+    const person: Data<Person> = {
       name,
-      city: object.city,
-      active: true
+      city: object.city
     }
 
     person.avatar = await avatarEditor.createAvatar()
 
-    await client.createDoc(contact.class.Employee, contact.space.Contacts, person, id)
+    await client.createDoc(contact.class.Person, contact.space.Contacts, person, id)
+    await client.createMixin(id, contact.class.Person, contact.space.Contacts, contact.mixin.Employee, {
+      active: true
+    })
 
-    await client.createDoc(contact.class.EmployeeAccount, core.space.Model, {
+    await client.createDoc(contact.class.PersonAccount, core.space.Model, {
       email: email.trim(),
       name,
-      employee: id,
+      person: id,
       role: AccountRole.User
     })
 
diff --git a/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte b/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte
index 23add26eca..e180f7fff3 100644
--- a/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte
+++ b/plugins/contact-resources/src/components/DeleteConfirmationPopup.svelte
@@ -17,22 +17,22 @@
   import { AccountRole, Doc, getCurrentAccount, Ref } from '@hcengineering/core'
   import view from '@hcengineering/view-resources/src/plugin'
   import { createEventDispatcher } from 'svelte'
-  import { EmployeeAccount } from '@hcengineering/contact'
-  import { employeeAccountByIdStore } from '../utils'
+  import { PersonAccount } from '@hcengineering/contact'
+  import { personAccountByIdStore } from '../utils'
   import ui, { Button, Label } from '@hcengineering/ui'
-  import EmployeeAccountRefPresenter from './EmployeeAccountRefPresenter.svelte'
-  import EmployeeAccountPresenter from './EmployeeAccountPresenter.svelte'
+  import PersonAccountRefPresenter from './PersonAccountRefPresenter.svelte'
+  import PersonAccountPresenter from './PersonAccountPresenter.svelte'
 
   export let object: Doc | Doc[]
   export let deleteAction: () => void
   const objectArray = Array.isArray(object) ? object : [object]
-  const owners: EmployeeAccount[] = Array.from($employeeAccountByIdStore.values()).filter(
+  const owners: PersonAccount[] = Array.from($personAccountByIdStore.values()).filter(
     (acc) => acc.role === AccountRole.Owner
   )
   const dispatch = createEventDispatcher()
-  $: creators = [...new Set(objectArray.map((obj) => obj.createdBy as Ref<EmployeeAccount>))]
+  $: creators = [...new Set(objectArray.map((obj) => obj.createdBy as Ref<PersonAccount>))]
   $: canDelete =
-    (creators.length === 1 && creators.includes(getCurrentAccount()._id as Ref<EmployeeAccount>)) ||
+    (creators.length === 1 && creators.includes(getCurrentAccount()._id as Ref<PersonAccount>)) ||
     getCurrentAccount().role === AccountRole.Owner
   $: label = canDelete ? view.string.DeleteObject : view.string.DeletePopupNoPermissionTitle
 </script>
@@ -62,7 +62,7 @@
         <Label label={view.string.DeletePopupCreatorLabel} />
         {#each creators as account}
           <div class="my-2">
-            <EmployeeAccountRefPresenter value={account} />
+            <PersonAccountRefPresenter value={account} />
           </div>
         {/each}
       </div>
@@ -70,7 +70,7 @@
         <Label label={view.string.DeletePopupOwnerLabel} />
         {#each owners as owner}
           <div class="my-2">
-            <EmployeeAccountPresenter value={owner} />
+            <PersonAccountPresenter value={owner} />
           </div>
         {/each}
       </div>
diff --git a/plugins/contact-resources/src/components/EditEmployee.svelte b/plugins/contact-resources/src/components/EditEmployee.svelte
index b7dfcbbe84..532603a850 100644
--- a/plugins/contact-resources/src/components/EditEmployee.svelte
+++ b/plugins/contact-resources/src/components/EditEmployee.svelte
@@ -14,7 +14,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Channel, Employee, EmployeeAccount, getFirstName, getLastName, Person } from '@hcengineering/contact'
+  import { Channel, Employee, PersonAccount, getFirstName, getLastName, Person } from '@hcengineering/contact'
   import { AccountRole, getCurrentAccount, Ref } from '@hcengineering/core'
   import login from '@hcengineering/login'
   import { getResource } from '@hcengineering/platform'
@@ -28,28 +28,27 @@
   import ChannelsEditor from './ChannelsEditor.svelte'
   import EditableAvatar from './EditableAvatar.svelte'
 
-  export let object: Employee
+  export let object: Person
   export let readonly = false
 
   export let channels: Channel[] | undefined = undefined
 
   const client = getClient()
 
-  const account = getCurrentAccount() as EmployeeAccount
+  const account = getCurrentAccount() as PersonAccount
 
   let avatarEditor: EditableAvatar
 
-  $: owner = account.employee === object._id
+  $: owner = account.person === object._id
   $: editable = !readonly && (account.role >= AccountRole.Maintainer || owner)
   let firstName = getFirstName(object.name)
   let lastName = getLastName(object.name)
-  let displayName = object.displayName ?? ''
 
   $: setName(object)
 
   let email: string | undefined
   $: if (editable) {
-    client.findOne(contact.class.EmployeeAccount, { employee: (object as Employee)._id }).then((acc) => {
+    client.findOne(contact.class.PersonAccount, { person: (object as Employee)._id }).then((acc) => {
       email = acc?.email
     })
   }
@@ -71,12 +70,6 @@
     await changeName(getFirstName(object.name), lastName)
   }
 
-  function changeDisplayName () {
-    client.update(object, {
-      displayName: displayName.trim() === '' ? null : displayName
-    })
-  }
-
   let integrations: Set<Ref<IntegrationType>> = new Set<Ref<IntegrationType>>()
   const settingsQuery = createQuery()
   $: settingsQuery.query(setting.class.Integration, { createdBy: account._id, disabled: false }, (res) => {
@@ -146,19 +139,6 @@
           {lastName}
         {/if}
       </div>
-      <div class="name">
-        {#if editable}
-          <EditBox
-            placeholder={contact.string.DisplayName}
-            bind:value={displayName}
-            on:change={changeDisplayName}
-            disabled={!editable}
-            focusIndex={1}
-          />
-        {:else}
-          {displayName}
-        {/if}
-      </div>
       <div class="location">
         <AttributeEditor maxWidth="20rem" _class={contact.class.Person} {editable} {object} key="city" focusIndex={3} />
       </div>
diff --git a/plugins/contact-resources/src/components/EditPerson.svelte b/plugins/contact-resources/src/components/EditPerson.svelte
index 751bf6af57..4c2d6f8f26 100644
--- a/plugins/contact-resources/src/components/EditPerson.svelte
+++ b/plugins/contact-resources/src/components/EditPerson.svelte
@@ -14,7 +14,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { combineName, EmployeeAccount, getFirstName, getLastName, Person } from '@hcengineering/contact'
+  import { combineName, PersonAccount, getFirstName, getLastName, Person } from '@hcengineering/contact'
   import { getCurrentAccount, Ref } from '@hcengineering/core'
   import { AttributeEditor, createQuery, getClient } from '@hcengineering/presentation'
   import setting, { IntegrationType } from '@hcengineering/setting'
@@ -27,7 +27,7 @@
   export let object: Person
   const client = getClient()
 
-  const account = getCurrentAccount() as EmployeeAccount
+  const account = getCurrentAccount() as PersonAccount
 
   let avatarEditor: EditableAvatar
 
diff --git a/plugins/contact-resources/src/components/EmployeeBox.svelte b/plugins/contact-resources/src/components/EmployeeBox.svelte
index 764bcbfc9b..63fc6e33b8 100644
--- a/plugins/contact-resources/src/components/EmployeeBox.svelte
+++ b/plugins/contact-resources/src/components/EmployeeBox.svelte
@@ -14,22 +14,22 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { Employee } from '@hcengineering/contact'
+  import contact, { Employee, Person } from '@hcengineering/contact'
   import type { Class, DocumentQuery, FindOptions, Ref } from '@hcengineering/core'
   import type { IntlString } from '@hcengineering/platform'
-  import { ButtonKind, ButtonSize, IconSize, LabelAndProps } from '@hcengineering/ui'
   import presentation from '@hcengineering/presentation'
-  import IconPerson from './icons/Person.svelte'
+  import { ButtonKind, ButtonSize, IconSize, LabelAndProps } from '@hcengineering/ui'
   import UserBox from './UserBox.svelte'
+  import IconPerson from './icons/Person.svelte'
 
-  export let _class: Ref<Class<Employee>> = contact.class.Employee
+  export let _class: Ref<Class<Employee>> = contact.mixin.Employee
   export let options: FindOptions<Employee> | undefined = undefined
   export let docQuery: DocumentQuery<Employee> | undefined = {
     active: true
   }
   export let label: IntlString
   export let placeholder: IntlString = presentation.string.Search
-  export let value: Ref<Employee> | null | undefined
+  export let value: Ref<Person> | null | undefined
   export let allowDeselect = false
   export let titleDeselect: IntlString | undefined = undefined
   export let kind: ButtonKind = 'no-border'
diff --git a/plugins/contact-resources/src/components/EmployeeBrowser.svelte b/plugins/contact-resources/src/components/EmployeeBrowser.svelte
index 4e832a3cce..2d6cc008d7 100644
--- a/plugins/contact-resources/src/components/EmployeeBrowser.svelte
+++ b/plugins/contact-resources/src/components/EmployeeBrowser.svelte
@@ -14,7 +14,7 @@
 
   async function updateEmployees (resultQuery: DocumentQuery<Employee>) {
     employees = await client.findAll(
-      contact.class.Employee,
+      contact.mixin.Employee,
       {
         ...resultQuery
       },
diff --git a/plugins/contact-resources/src/components/EmployeeEditor.svelte b/plugins/contact-resources/src/components/EmployeeEditor.svelte
index f75d479b97..b71c3d0c96 100644
--- a/plugins/contact-resources/src/components/EmployeeEditor.svelte
+++ b/plugins/contact-resources/src/components/EmployeeEditor.svelte
@@ -31,7 +31,7 @@
   export let readonly = false
   export let showNavigate = true
 
-  $: _class = type?.to ?? contact.class.Employee
+  $: _class = type?.to ?? contact.mixin.Employee
 
   const query: DocumentQuery<Employee> = {
     active: true
diff --git a/plugins/contact-resources/src/components/EmployeeFilter.svelte b/plugins/contact-resources/src/components/EmployeeFilter.svelte
index 111381d62a..98e15266f9 100644
--- a/plugins/contact-resources/src/components/EmployeeFilter.svelte
+++ b/plugins/contact-resources/src/components/EmployeeFilter.svelte
@@ -78,7 +78,7 @@
         : {
             _id: { $in: Array.from(targets.keys()) }
           }
-    objectsPromise = client.findAll(contact.class.Employee, resultQuery, { sort: { name: SortingOrder.Ascending } })
+    objectsPromise = client.findAll(contact.mixin.Employee, resultQuery, { sort: { name: SortingOrder.Ascending } })
     values = await objectsPromise
     if (targets.has(undefined)) {
       values.unshift(undefined)
diff --git a/plugins/contact-resources/src/components/EmployeeFilterValuePresenter.svelte b/plugins/contact-resources/src/components/EmployeeFilterValuePresenter.svelte
index 0f240b6c87..0d111bbfcb 100644
--- a/plugins/contact-resources/src/components/EmployeeFilterValuePresenter.svelte
+++ b/plugins/contact-resources/src/components/EmployeeFilterValuePresenter.svelte
@@ -13,12 +13,12 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Employee } from '@hcengineering/contact'
+  import { Person } from '@hcengineering/contact'
   import { Ref } from '@hcengineering/core'
   import CombineAvatars from './CombineAvatars.svelte'
   import contact from '../plugin'
 
-  export let value: Ref<Employee>[]
+  export let value: Ref<Person>[]
 </script>
 
-<CombineAvatars _class={contact.class.Employee} items={value} limit={5} size={'x-small'} />
+<CombineAvatars _class={contact.mixin.Employee} items={value} limit={5} size={'x-small'} />
diff --git a/plugins/contact-resources/src/components/EmployeePresenter.svelte b/plugins/contact-resources/src/components/EmployeePresenter.svelte
index 5798803856..0bc4e0e163 100644
--- a/plugins/contact-resources/src/components/EmployeePresenter.svelte
+++ b/plugins/contact-resources/src/components/EmployeePresenter.svelte
@@ -1,13 +1,13 @@
 <script lang="ts">
-  import { Employee } from '@hcengineering/contact'
+  import { Employee, Person } from '@hcengineering/contact'
   import { Ref, WithLookup } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import ui, { IconSize } from '@hcengineering/ui'
-  import { PersonLabelTooltip, employeeByIdStore } from '..'
+  import { PersonLabelTooltip, employeeByIdStore, personByIdStore } from '..'
   import PersonPresenter from '../components/PersonPresenter.svelte'
   import contact from '../plugin'
 
-  export let value: Ref<Employee> | WithLookup<Employee> | null | undefined
+  export let value: Ref<Person> | WithLookup<Person> | null | undefined
   export let tooltipLabels: PersonLabelTooltip | undefined = undefined
   export let shouldShowAvatar: boolean = true
   export let shouldShowName: boolean = true
@@ -21,7 +21,10 @@
   export let defaultName: IntlString | undefined = ui.string.NotSelected
   export let element: HTMLElement | undefined = undefined
 
-  $: employeeValue = typeof value === 'string' ? $employeeByIdStore.get(value) : value
+  $: employeeValue = typeof value === 'string' ? $personByIdStore.get(value) : value
+
+  $: active =
+    employeeValue !== undefined ? $employeeByIdStore.get(employeeValue?._id as Ref<Employee>)?.active ?? false : false
 </script>
 
 <PersonPresenter
@@ -38,6 +41,6 @@
   {colorInherit}
   {accent}
   {defaultName}
-  statusLabel={employeeValue?.active === false && shouldShowName ? contact.string.Inactive : undefined}
+  statusLabel={active === false && shouldShowName ? contact.string.Inactive : undefined}
   on:accent-color
 />
diff --git a/plugins/contact-resources/src/components/EmployeePreviewPopup.svelte b/plugins/contact-resources/src/components/EmployeePreviewPopup.svelte
index caf11f9991..317a55bb15 100644
--- a/plugins/contact-resources/src/components/EmployeePreviewPopup.svelte
+++ b/plugins/contact-resources/src/components/EmployeePreviewPopup.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import { Employee, EmployeeAccount, getName, Status } from '@hcengineering/contact'
+  import { Employee, PersonAccount, getName, Status } from '@hcengineering/contact'
   import { getCurrentAccount, Ref } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import Avatar from './Avatar.svelte'
@@ -15,12 +15,12 @@
   export let employeeId: Ref<Employee>
 
   const client = getClient()
-  const me = (getCurrentAccount() as EmployeeAccount).employee
+  const me = (getCurrentAccount() as PersonAccount).person
   $: editable = employeeId === me
 
   const statusesQuery = createQuery()
   let status: Status | undefined = undefined
-  $: employee = $employeeByIdStore.get(employeeId)
+  $: employee = $employeeByIdStore.get(employeeId) as Employee
   statusesQuery.query(contact.class.Status, { attachedTo: employeeId }, (res) => (status = res[0]))
 
   const dispatch = createEventDispatcher()
@@ -39,7 +39,7 @@
         } else if (status && !newStatus) {
           client.removeDoc(contact.class.Status, status.space, status._id)
         } else {
-          client.addCollection(contact.class.Status, employee!.space, employeeId, contact.class.Employee, 'statuses', {
+          client.addCollection(contact.class.Status, employee!.space, employeeId, contact.mixin.Employee, 'statuses', {
             name: newStatus.name,
             dueDate: newStatus.dueDate
           })
@@ -60,7 +60,7 @@
     <div class="flex-col-center pb-2">
       <Avatar size="x-large" avatar={employee.avatar} />
     </div>
-    <div class="pb-2">{getName(employee)}</div>
+    <div class="pb-2">{getName(client.getHierarchy(), employee)}</div>
     <DocNavLink object={employee}>
       <Label label={contact.string.ViewFullProfile} />
     </DocNavLink>
diff --git a/plugins/contact-resources/src/components/MembersPresenter.svelte b/plugins/contact-resources/src/components/MembersPresenter.svelte
index 4e9c9f4442..49cf08126a 100644
--- a/plugins/contact-resources/src/components/MembersPresenter.svelte
+++ b/plugins/contact-resources/src/components/MembersPresenter.svelte
@@ -61,7 +61,7 @@
     showPopup(
       UsersPopup,
       {
-        _class: contact.class.Employee,
+        _class: contact.mixin.Employee,
         selectedUsers: members,
         allowDeselect: true,
         multiSelect: true,
diff --git a/plugins/contact-resources/src/components/MergeAttributeComparer.svelte b/plugins/contact-resources/src/components/MergeAttributeComparer.svelte
index fa2256d09b..b88c5b9882 100644
--- a/plugins/contact-resources/src/components/MergeAttributeComparer.svelte
+++ b/plugins/contact-resources/src/components/MergeAttributeComparer.svelte
@@ -13,14 +13,14 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Employee } from '@hcengineering/contact'
+  import { Person } from '@hcengineering/contact'
   import { Class, Doc, Ref } from '@hcengineering/core'
   import { getAttribute, getAttributeEditor, getClient } from '@hcengineering/presentation'
   import MergeComparer from './MergeComparer.svelte'
 
-  export let value: Employee
+  export let value: Person
   export let _class: Ref<Class<Doc>>
-  export let targetEmp: Employee
+  export let targetEmp: Person
   export let key: string
   export let onChange: (key: string, value: boolean) => void
   export let selected = false
diff --git a/plugins/contact-resources/src/components/MergeComparer.svelte b/plugins/contact-resources/src/components/MergeComparer.svelte
index 2f9a7ceb4b..9417c0670f 100644
--- a/plugins/contact-resources/src/components/MergeComparer.svelte
+++ b/plugins/contact-resources/src/components/MergeComparer.svelte
@@ -13,13 +13,13 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Employee } from '@hcengineering/contact'
+  import { Person } from '@hcengineering/contact'
   import { Doc, Mixin, Ref } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
   import { CheckBox, Label } from '@hcengineering/ui'
 
-  export let value: Employee
-  export let targetEmp: Employee
+  export let value: Person
+  export let targetEmp: Person
   export let cast: Ref<Mixin<Doc>> | undefined = undefined
   export let key: string
   export let selected = false
@@ -28,7 +28,7 @@
   const client = getClient()
   const hierarchy = client.getHierarchy()
 
-  function isEqual (value: Employee, targetEmp: Employee, key: string) {
+  function isEqual (value: Person, targetEmp: Person, key: string) {
     if (cast !== undefined) {
       value = hierarchy.as(value, cast)
       targetEmp = hierarchy.as(targetEmp, cast)
diff --git a/plugins/contact-resources/src/components/MergeEmployee.svelte b/plugins/contact-resources/src/components/MergePersons.svelte
similarity index 53%
rename from plugins/contact-resources/src/components/MergeEmployee.svelte
rename to plugins/contact-resources/src/components/MergePersons.svelte
index 4898aed8a3..ea72563f2a 100644
--- a/plugins/contact-resources/src/components/MergeEmployee.svelte
+++ b/plugins/contact-resources/src/components/MergePersons.svelte
@@ -13,9 +13,9 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Channel, Employee, getName } from '@hcengineering/contact'
-  import core, { Doc, DocumentUpdate, Mixin, Ref, TxProcessor } from '@hcengineering/core'
-  import { Card, createQuery, getClient } from '@hcengineering/presentation'
+  import { Channel, Person, getName } from '@hcengineering/contact'
+  import core, { Doc, DocumentUpdate, Mixin, Ref, RefTo, Tx, TxOperations, TxProcessor } from '@hcengineering/core'
+  import { Card, createQuery, getClient, updateAttribute } from '@hcengineering/presentation'
   import { Toggle } from '@hcengineering/ui'
   import { isCollectionAttr } from '@hcengineering/view-resources'
   import { createEventDispatcher } from 'svelte'
@@ -24,40 +24,40 @@
   import ChannelPresenter from './ChannelPresenter.svelte'
   import ChannelsDropdown from './ChannelsDropdown.svelte'
   import EditEmployee from './EditEmployee.svelte'
-  import EmployeeBox from './EmployeeBox.svelte'
   import MergeAttributeComparer from './MergeAttributeComparer.svelte'
   import MergeComparer from './MergeComparer.svelte'
+  import UserBox from './UserBox.svelte'
 
-  export let value: Employee
+  export let value: Person
   const dispatch = createEventDispatcher()
   const client = getClient()
   const hierarchy = client.getHierarchy()
-  const parent = hierarchy.getParentClass(contact.class.Employee)
+  const parent = hierarchy.getParentClass(contact.class.Person)
   const mixins = hierarchy.getDescendants(parent).filter((p) => hierarchy.isMixin(p))
 
-  let sourceEmployee = value._id
-  let sourceEmp: Employee | undefined = undefined
+  let sourcePersonRef = value._id
+  let sourcePerson: Person | undefined = undefined
 
-  let targetEmployee: Ref<Employee> | undefined = undefined
-  let targetEmp: Employee | undefined = undefined
+  let targetPersonRf: Ref<Person> | undefined = undefined
+  let targetPerson: Person | undefined = undefined
 
   const targetQuery = createQuery()
-  $: targetEmployee &&
-    sourceEmployee &&
-    targetQuery.query(contact.class.Employee, { _id: { $in: [sourceEmployee, targetEmployee] } }, (res) => {
+  $: targetPersonRf &&
+    sourcePersonRef &&
+    targetQuery.query(contact.class.Person, { _id: { $in: [sourcePersonRef, targetPersonRf] } }, (res) => {
       // ;[targetEmp] = res
-      sourceEmp = res.find((it) => it._id === sourceEmployee)
-      targetEmp = res.find((it) => it._id === targetEmployee)
-      if (sourceEmp && targetEmp) {
-        update = fillUpdate(sourceEmp, targetEmp)
-        mixinUpdate = fillMixinUpdate(sourceEmp, targetEmp)
+      sourcePerson = res.find((it) => it._id === sourcePersonRef)
+      targetPerson = res.find((it) => it._id === targetPersonRf)
+      if (sourcePerson && targetPerson) {
+        update = fillUpdate(sourcePerson, targetPerson)
+        mixinUpdate = fillMixinUpdate(sourcePerson, targetPerson)
         applyUpdate(update)
       }
     })
 
-  function fillUpdate (source: Employee, target: Employee): DocumentUpdate<Employee> {
-    const res: DocumentUpdate<Employee> = {}
-    const attributes = hierarchy.getOwnAttributes(contact.class.Employee)
+  function fillUpdate (source: Person, target: Person): DocumentUpdate<Person> {
+    const res: DocumentUpdate<Person> = {}
+    const attributes = hierarchy.getOwnAttributes(contact.class.Person)
     for (const attribute of attributes) {
       const key = attribute[0]
       if (attribute[1].hidden) continue
@@ -69,7 +69,7 @@
     return res
   }
 
-  function fillMixinUpdate (source: Employee, target: Employee): Record<Ref<Mixin<Doc>>, DocumentUpdate<Doc>> {
+  function fillMixinUpdate (source: Person, target: Person): Record<Ref<Mixin<Doc>>, DocumentUpdate<Doc>> {
     const res: Record<Ref<Mixin<Doc>>, DocumentUpdate<Doc>> = {}
     for (const mixin of mixins) {
       if (!hierarchy.hasMixin(source, mixin)) continue
@@ -88,30 +88,31 @@
     return res
   }
 
-  let update: DocumentUpdate<Employee> = {}
+  let update: DocumentUpdate<Person> = {}
   let mixinUpdate: Record<Ref<Mixin<Doc>>, DocumentUpdate<Doc>> = {}
 
-  let result: Employee = { ...value }
+  let result: Person = { ...value }
 
-  function applyUpdate (update: DocumentUpdate<Employee>): void {
-    const r = hierarchy.clone(targetEmp)
+  function applyUpdate (update: DocumentUpdate<Person>): void {
+    const r = hierarchy.clone(targetPerson)
     TxProcessor.applyUpdate(r, update)
     result = r
   }
 
   async function merge (): Promise<void> {
-    if (sourceEmp === undefined || targetEmp === undefined) return
+    if (sourcePerson === undefined || targetPerson === undefined) return
     if (Object.keys(update).length > 0) {
-      if (update.avatar !== undefined || sourceEmp.avatar === targetEmp.avatar) {
+      if (update.avatar !== undefined || sourcePerson.avatar === targetPerson.avatar) {
         // We replace avatar, we need to update source with target
-        await client.update(sourceEmp, { avatar: sourceEmp.avatar === targetEmp.avatar ? '' : targetEmp.avatar })
+        await client.update(sourcePerson, {
+          avatar: sourcePerson.avatar === targetPerson.avatar ? '' : targetPerson.avatar
+        })
       }
-      await client.update(targetEmp, update)
+      await client.update(targetPerson, update)
     }
-    await client.update(sourceEmp, { mergedTo: targetEmp._id, active: false })
     for (const channel of resultChannels.values()) {
-      if (channel.attachedTo !== targetEmp._id) continue
-      await client.update(channel, { attachedTo: targetEmp._id })
+      if (channel.attachedTo !== targetPerson._id) continue
+      await client.update(channel, { attachedTo: targetPerson._id })
     }
     for (const old of oldChannels) {
       if ((enabledChannels.get(old._id) ?? true) === false) {
@@ -121,18 +122,31 @@
     for (const mixin in mixinUpdate) {
       const attrs = (mixinUpdate as any)[mixin]
       if (Object.keys(attrs).length > 0) {
-        await client.updateMixin(targetEmp._id, targetEmp._class, targetEmp.space, mixin as Ref<Mixin<Doc>>, attrs)
-      } else if (!hierarchy.hasMixin(targetEmp, mixin as Ref<Mixin<Doc>>)) {
-        await client.createMixin(targetEmp._id, targetEmp._class, targetEmp.space, mixin as Ref<Mixin<Doc>>, {})
+        await client.updateMixin(
+          targetPerson._id,
+          targetPerson._class,
+          targetPerson.space,
+          mixin as Ref<Mixin<Doc>>,
+          attrs
+        )
+      } else if (!hierarchy.hasMixin(targetPerson, mixin as Ref<Mixin<Doc>>)) {
+        await client.createMixin(
+          targetPerson._id,
+          targetPerson._class,
+          targetPerson.space,
+          mixin as Ref<Mixin<Doc>>,
+          {}
+        )
       }
     }
+    await updateAllRefs(client, sourcePerson, targetPerson)
 
     dispatch('close')
   }
 
   function select (field: string, targetValue: boolean) {
     if (!targetValue) {
-      ;(update as any)[field] = (sourceEmp as any)[field]
+      ;(update as any)[field] = (sourcePerson as any)[field]
     } else {
       delete (update as any)[field]
     }
@@ -166,20 +180,20 @@
   let oldChannels: Channel[] = []
   const valueChannelsQuery = createQuery()
 
-  $: valueChannelsQuery.query(contact.class.Channel, { attachedTo: sourceEmployee }, (res) => {
+  $: valueChannelsQuery.query(contact.class.Channel, { attachedTo: sourcePersonRef }, (res) => {
     oldChannels = res
   })
 
   let targetChannels: Channel[] = []
   const targetChannelsQuery = createQuery()
-  $: targetEmployee &&
-    targetChannelsQuery.query(contact.class.Channel, { attachedTo: targetEmployee }, (res) => {
+  $: targetPersonRf &&
+    targetChannelsQuery.query(contact.class.Channel, { attachedTo: targetPersonRf }, (res) => {
       targetChannels = res
     })
 
   $: resultChannels = mergeChannels(oldChannels, targetChannels, enabledChannels)
 
-  const attributes = hierarchy.getAllAttributes(contact.class.Employee, core.class.Doc)
+  const attributes = hierarchy.getAllAttributes(contact.mixin.Employee, core.class.Doc)
   const ignoreKeys = ['name', 'avatar', 'createdOn']
   const objectAttributes = Array.from(attributes.entries()).filter(
     (p) => !p[1].hidden && !ignoreKeys.includes(p[0]) && !isCollectionAttr(hierarchy, { key: p[0], attr: p[1] })
@@ -200,25 +214,111 @@
     }
     mixinUpdate[mixin] = upd
   }
+
+  async function updateAllRefs (client: TxOperations, sourceAccount: Person, targetAccount: Person): Promise<Tx[]> {
+    const accounts = await client.findAll(contact.class.PersonAccount, { person: sourceAccount._id })
+
+    const h = client.getHierarchy()
+    console.log('merge employee:', sourceAccount.name, 'to', targetAccount.name)
+    // Move all possible references to Account and Employee and replace to target one.
+    const reftos = (await client.findAll(core.class.Attribute, { 'type._class': core.class.RefTo })).filter((it) => {
+      const to = it.type as RefTo<Doc>
+      return (
+        to.to === contact.class.Person ||
+        to.to === contact.mixin.Employee ||
+        to.to === core.class.Account ||
+        to.to === contact.class.PersonAccount
+      )
+    })
+
+    for (const attr of reftos) {
+      if (attr.name === '_id') {
+        continue
+      }
+      const to = attr.type as RefTo<Doc>
+      if (to.to === contact.mixin.Employee || to.to === contact.class.Person) {
+        const descendants = h.getDescendants(attr.attributeOf)
+        for (const d of descendants) {
+          if (h.isDerived(d, core.class.Tx)) {
+            continue
+          }
+          if (h.findDomain(d) !== undefined) {
+            while (true) {
+              const values = await client.findAll(d, { [attr.name]: sourceAccount._id }, { limit: 100 })
+              if (values.length === 0) {
+                break
+              }
+
+              const builder = client.apply(sourceAccount._id)
+              for (const v of values) {
+                await updateAttribute(builder, v, d, { key: attr.name, attr }, targetAccount._id)
+              }
+              if (builder.txes.length > 0) {
+                console.log('merge employee:', sourceAccount.name, 'to', targetAccount.name, d, builder.txes.length)
+                await builder.commit()
+              }
+            }
+          }
+        }
+      }
+    }
+    const arrs = await client.findAll(core.class.Attribute, { 'type._class': core.class.ArrOf })
+    for (const attr of arrs) {
+      if (attr.name === '_id') {
+        continue
+      }
+      const to = attr.type as RefTo<Doc>
+      if (to.to === contact.mixin.Employee || to.to === contact.class.Person) {
+        const descendants = h.getDescendants(attr.attributeOf)
+        for (const d of descendants) {
+          if (h.isDerived(d, core.class.Tx)) {
+            continue
+          }
+          if (h.findDomain(d) !== undefined) {
+            while (true) {
+              const values = await client.findAll(attr.attributeOf, { [attr.name]: sourceAccount._id }, { limit: 100 })
+              if (values.length === 0) {
+                break
+              }
+              const builder = client.apply(sourceAccount._id)
+              for (const v of values) {
+                await updateAttribute(builder, v, d, { key: attr.name, attr }, targetAccount._id)
+              }
+              console.log('merge employee:', sourceAccount.name, 'to', targetAccount.name, d, builder.txes.length)
+              await builder.commit()
+            }
+          }
+        }
+      }
+    }
+
+    await client.remove(sourceAccount)
+    for (const account of accounts) {
+      await client.update(account, { person: targetAccount._id })
+    }
+    return []
+  }
+
   const toAny = (a: any) => a
 </script>
 
 <Card
-  label={contact.string.MergeEmployee}
-  okLabel={contact.string.MergeEmployee}
+  label={contact.string.MergePersons}
+  okLabel={contact.string.MergePersons}
   fullSize
   okAction={merge}
-  canSave={targetEmp !== undefined}
+  canSave={targetPerson !== undefined}
   onCancel={() => dispatch('close')}
   on:changeContent
 >
   <div class="flex-row flex-between">
     <div class="flex-row-center">
-      <EmployeeBox
+      <UserBox
+        _class={contact.class.Person}
         showNavigate={false}
-        label={contact.string.MergeEmployeeFrom}
-        docQuery={{ active: { $in: [true, false] } }}
-        bind:value={sourceEmployee}
+        label={contact.string.MergePersonsFrom}
+        docQuery={{}}
+        bind:value={sourcePersonRef}
       />
       <ChannelsDropdown
         value={oldChannels}
@@ -231,11 +331,12 @@
     </div>
     >>
     <div class="flex-row-center">
-      <EmployeeBox
+      <UserBox
+        _class={contact.class.Person}
         showNavigate={false}
-        label={contact.string.MergeEmployeeTo}
-        docQuery={{ active: { $in: [true, false] } }}
-        bind:value={targetEmployee}
+        label={contact.string.MergePersonsTo}
+        docQuery={{ _id: { $ne: sourcePersonRef } }}
+        bind:value={targetPersonRf}
       />
       <ChannelsDropdown
         value={targetChannels}
@@ -247,13 +348,13 @@
       />
     </div>
   </div>
-  {#key [targetEmployee, sourceEmployee]}
-    {#if targetEmp && sourceEmp}
+  {#key [targetPersonRf, sourcePersonRef]}
+    {#if targetPerson && sourcePerson}
       <div class="flex-col flex-grow">
         <MergeComparer
           key="avatar"
-          value={sourceEmp}
-          {targetEmp}
+          value={sourcePerson}
+          targetEmp={targetPerson}
           onChange={select}
           selected={update.avatar !== undefined}
         >
@@ -261,18 +362,24 @@
             <Avatar avatar={item.avatar} size={'x-large'} icon={contact.icon.Person} />
           </svelte:fragment>
         </MergeComparer>
-        <MergeComparer key="name" value={sourceEmp} {targetEmp} onChange={select} selected={update.name !== undefined}>
+        <MergeComparer
+          key="name"
+          value={sourcePerson}
+          targetEmp={targetPerson}
+          onChange={select}
+          selected={update.name !== undefined}
+        >
           <svelte:fragment slot="item" let:item>
-            {getName(item)}
+            {getName(client.getHierarchy(), item)}
           </svelte:fragment>
         </MergeComparer>
         {#each objectAttributes as attribute}
           <MergeAttributeComparer
             key={attribute[0]}
-            value={sourceEmp}
-            {targetEmp}
+            value={sourcePerson}
+            targetEmp={targetPerson}
             onChange={select}
-            _class={contact.class.Employee}
+            _class={contact.mixin.Employee}
             selected={toAny(update)[attribute[0]] !== undefined}
           />
         {/each}
@@ -281,8 +388,8 @@
           {#each attributes as attribute}
             <MergeAttributeComparer
               key={attribute}
-              value={sourceEmp}
-              {targetEmp}
+              value={sourcePerson}
+              targetEmp={targetPerson}
               onChange={(key, value) => selectMixin(mixin, key, value)}
               _class={mixin}
               selected={toAny(mixinUpdate)?.[mixin]?.[attribute] !== undefined}
diff --git a/plugins/contact-resources/src/components/EmployeeAccountFilterValuePresenter.svelte b/plugins/contact-resources/src/components/PersonAccountFilterValuePresenter.svelte
similarity index 75%
rename from plugins/contact-resources/src/components/EmployeeAccountFilterValuePresenter.svelte
rename to plugins/contact-resources/src/components/PersonAccountFilterValuePresenter.svelte
index 07dfac2c5f..5a72c79d21 100644
--- a/plugins/contact-resources/src/components/EmployeeAccountFilterValuePresenter.svelte
+++ b/plugins/contact-resources/src/components/PersonAccountFilterValuePresenter.svelte
@@ -13,17 +13,17 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Employee, EmployeeAccount } from '@hcengineering/contact'
+  import { Employee, PersonAccount } from '@hcengineering/contact'
   import { Ref } from '@hcengineering/core'
   import contact from '../plugin'
-  import { employeeAccountByIdStore } from '../utils'
+  import { personAccountByIdStore } from '../utils'
   import CombineAvatars from './CombineAvatars.svelte'
 
-  export let value: Ref<EmployeeAccount>[]
+  export let value: Ref<PersonAccount>[]
 
   $: employees = value
-    .map((p) => $employeeAccountByIdStore.get(p)?.employee)
+    .map((p) => $personAccountByIdStore.get(p)?.person)
     .filter((p) => p !== undefined) as Ref<Employee>[]
 </script>
 
-<CombineAvatars _class={contact.class.Employee} items={employees} limit={5} size={'x-small'} />
+<CombineAvatars _class={contact.mixin.Employee} items={employees} limit={5} size={'x-small'} />
diff --git a/plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte b/plugins/contact-resources/src/components/PersonAccountPresenter.svelte
similarity index 73%
rename from plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte
rename to plugins/contact-resources/src/components/PersonAccountPresenter.svelte
index 2029d17aa6..4c705e35a0 100644
--- a/plugins/contact-resources/src/components/EmployeeAccountPresenter.svelte
+++ b/plugins/contact-resources/src/components/PersonAccountPresenter.svelte
@@ -14,13 +14,14 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
-  import core, { Account, systemAccountEmail } from '@hcengineering/core'
+  import { Employee, PersonAccount } from '@hcengineering/contact'
+  import core, { Account, Ref, systemAccountEmail } from '@hcengineering/core'
   import { getEmbeddedLabel } from '@hcengineering/platform'
-  import { Label, tooltip, IconSize } from '@hcengineering/ui'
-  import { employeeByIdStore } from '../utils'
+  import { IconSize, Label, tooltip } from '@hcengineering/ui'
+  import { employeeByIdStore, personAccountPersonByIdStore } from '../utils'
   import Avatar from './Avatar.svelte'
   import EmployeePresenter from './EmployeePresenter.svelte'
+  import PersonPresenter from './PersonPresenter.svelte'
 
   export let value: Account
   export let avatarSize: IconSize = 'x-small'
@@ -28,8 +29,9 @@
   export let inline: boolean = false
   export let accent: boolean = false
 
-  $: employee = $employeeByIdStore.get((value as EmployeeAccount)?.employee)
+  $: employee = $employeeByIdStore.get((value as PersonAccount)?.person as Ref<Employee>)
 
+  $: person = $personAccountPersonByIdStore.get((value as PersonAccount)?.person)
   const valueLabel = value?.email === systemAccountEmail ? core.string.System : getEmbeddedLabel(value?.email)
 </script>
 
@@ -37,6 +39,8 @@
   <!-- svelte-ignore a11y-click-events-have-key-events -->
   {#if employee}
     <EmployeePresenter value={employee} {disabled} {inline} {accent} {avatarSize} on:accent-color />
+  {:else if person}
+    <PersonPresenter value={person} {disabled} {inline} {accent} {avatarSize} on:accent-color />
   {:else}
     <div class="flex-row-center">
       <Avatar size={avatarSize} />
diff --git a/plugins/contact-resources/src/components/EmployeeAccountRefPresenter.svelte b/plugins/contact-resources/src/components/PersonAccountRefPresenter.svelte
similarity index 72%
rename from plugins/contact-resources/src/components/EmployeeAccountRefPresenter.svelte
rename to plugins/contact-resources/src/components/PersonAccountRefPresenter.svelte
index bc0b0f6259..336d64b98f 100644
--- a/plugins/contact-resources/src/components/EmployeeAccountRefPresenter.svelte
+++ b/plugins/contact-resources/src/components/PersonAccountRefPresenter.svelte
@@ -14,21 +14,21 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { Ref } from '@hcengineering/core'
   import { IconSize } from '@hcengineering/ui'
-  import { employeeAccountByIdStore } from '../utils'
-  import EmployeeAccountPresenter from './EmployeeAccountPresenter.svelte'
+  import { personAccountByIdStore } from '../utils'
+  import PersonAccountPresenter from './PersonAccountPresenter.svelte'
 
-  export let value: Ref<EmployeeAccount>
+  export let value: Ref<PersonAccount>
   export let avatarSize: IconSize = 'x-small'
   export let disabled: boolean = false
   export let inline: boolean = false
   export let accent: boolean = false
 
-  $: account = $employeeAccountByIdStore.get(value)
+  $: account = $personAccountByIdStore.get(value)
 </script>
 
 {#if account}
-  <EmployeeAccountPresenter value={account} {disabled} {inline} {avatarSize} on:accent-color />
+  <PersonAccountPresenter value={account} {disabled} {inline} {avatarSize} on:accent-color />
 {/if}
diff --git a/plugins/contact-resources/src/components/PersonCard.svelte b/plugins/contact-resources/src/components/PersonCard.svelte
index 831f97779c..a57bd13ba9 100644
--- a/plugins/contact-resources/src/components/PersonCard.svelte
+++ b/plugins/contact-resources/src/components/PersonCard.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import attachment from '@hcengineering/attachment'
   import contact, { Channel, Contact, getName } from '@hcengineering/contact'
-  import { createQuery } from '@hcengineering/presentation'
+  import { createQuery, getClient } from '@hcengineering/presentation'
   import Avatar from './Avatar.svelte'
   import { Component, Label } from '@hcengineering/ui'
   import { DocNavLink } from '@hcengineering/view-resources'
@@ -24,6 +24,8 @@
   export let object: Contact
   export let disabled: boolean = false
 
+  const client = getClient()
+
   let channels: Channel[] = []
   const channelsQuery = createQuery()
   channelsQuery.query(
@@ -46,7 +48,7 @@
     <!-- svelte-ignore a11y-click-events-have-key-events -->
     <DocNavLink {object} {disabled}>
       <div class="name lines-limit-2">
-        {getName(object)}
+        {getName(client.getHierarchy(), object)}
       </div>
     </DocNavLink>
     <div class="description overflow-label">{object.city ?? ''}</div>
diff --git a/plugins/contact-resources/src/components/PersonContent.svelte b/plugins/contact-resources/src/components/PersonContent.svelte
index 54e5b53535..5f78199eb1 100644
--- a/plugins/contact-resources/src/components/PersonContent.svelte
+++ b/plugins/contact-resources/src/components/PersonContent.svelte
@@ -27,6 +27,7 @@
   import { DocNavLink } from '@hcengineering/view-resources'
   import { createEventDispatcher, onMount } from 'svelte'
   import Avatar from './Avatar.svelte'
+  import { getClient } from '@hcengineering/presentation'
 
   export let value: Person | Employee | undefined | null
   export let inline: boolean = false
@@ -45,6 +46,8 @@
   export let accent: boolean = false
   export let maxWidth = ''
 
+  const client = getClient()
+
   const onEditClick = (evt: MouseEvent) => {
     if (!disabled) {
       onEdit?.(evt)
@@ -83,7 +86,9 @@
         </span>
       {/if}
       {#if shouldShowName}
-        <span class="eContentPresenterLabel" class:colorInherit class:fs-bold={accent}>{getName(value)}</span>
+        <span class="eContentPresenterLabel" class:colorInherit class:fs-bold={accent}
+          >{getName(client.getHierarchy(), value)}</span
+        >
       {/if}
     </span>
   </DocNavLink>
diff --git a/plugins/contact-resources/src/components/PersonPresenter.svelte b/plugins/contact-resources/src/components/PersonPresenter.svelte
index 4b7b1cdf27..dbe1f4070e 100644
--- a/plugins/contact-resources/src/components/PersonPresenter.svelte
+++ b/plugins/contact-resources/src/components/PersonPresenter.svelte
@@ -18,6 +18,7 @@
   import type { LabelAndProps, IconSize } from '@hcengineering/ui'
   import { PersonLabelTooltip } from '..'
   import PersonContent from './PersonContent.svelte'
+  import { getClient } from '@hcengineering/presentation'
 
   export let value: Person | null | undefined
   export let inline = false
@@ -36,6 +37,8 @@
   export let accent: boolean = false
   export let maxWidth = ''
 
+  const client = getClient()
+
   function getTooltip (
     tooltipLabels: PersonLabelTooltip | undefined,
     value: Person | null | undefined
@@ -44,7 +47,7 @@
       return !value
         ? undefined
         : {
-            label: getEmbeddedLabel(getName(value))
+            label: getEmbeddedLabel(getName(client.getHierarchy(), value))
           }
     }
     const direction = tooltipLabels?.direction
@@ -52,11 +55,15 @@
     const label = value
       ? tooltipLabels.personLabel
         ? tooltipLabels.personLabel
-        : getEmbeddedLabel(getName(value))
+        : getEmbeddedLabel(getName(client.getHierarchy(), value))
       : tooltipLabels.placeholderLabel
         ? tooltipLabels.placeholderLabel
         : undefined
-    const props = tooltipLabels.props ? tooltipLabels.props : value ? { value: getName(value) } : undefined
+    const props = tooltipLabels.props
+      ? tooltipLabels.props
+      : value
+        ? { value: getName(client.getHierarchy(), value) }
+        : undefined
     return {
       component,
       label,
diff --git a/plugins/contact-resources/src/components/SelectAvatars.svelte b/plugins/contact-resources/src/components/SelectAvatars.svelte
index 4aaf0e8e2e..1e3a85178f 100644
--- a/plugins/contact-resources/src/components/SelectAvatars.svelte
+++ b/plugins/contact-resources/src/components/SelectAvatars.svelte
@@ -25,7 +25,7 @@
   import UsersPopup from './UsersPopup.svelte'
 
   export let items: Ref<Employee>[] = []
-  export let _class: Ref<Class<Employee>> = contact.class.Employee
+  export let _class: Ref<Class<Employee>> = contact.mixin.Employee
   export let docQuery: DocumentQuery<Employee> | undefined = {
     active: true
   }
diff --git a/plugins/contact-resources/src/components/SpaceMembers.svelte b/plugins/contact-resources/src/components/SpaceMembers.svelte
index 9b8584c53f..cc264188cd 100644
--- a/plugins/contact-resources/src/components/SpaceMembers.svelte
+++ b/plugins/contact-resources/src/components/SpaceMembers.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { Employee, EmployeeAccount } from '@hcengineering/contact'
+  import contact, { Person, PersonAccount, Employee } from '@hcengineering/contact'
   import { Account, AccountRole, DocumentQuery, getCurrentAccount, Ref, SortingOrder, Space } from '@hcengineering/core'
   import { translate } from '@hcengineering/platform'
   import presentation, { getClient } from '@hcengineering/presentation'
@@ -33,29 +33,24 @@
   }
   let search: string = ''
   $: isSearch = search.trim().length
-  let members: Set<Ref<Employee>> = new Set<Ref<Employee>>()
+  let members: Set<Ref<Person>> = new Set<Ref<Person>>()
 
-  async function getUsers (accounts: Ref<Account>[], search: string): Promise<Employee[]> {
-    const query: DocumentQuery<EmployeeAccount> =
-      isSearch > 0 ? { name: { $like: '%' + search + '%' } } : { _id: { $in: accounts as Ref<EmployeeAccount>[] } }
-    const employess = await client.findAll(contact.class.EmployeeAccount, query)
-    members = new Set(
-      employess
-        .filter((it) => it.mergedTo == null)
-        .filter((p) => accounts.includes(p._id))
-        .map((p) => p.employee)
-    )
+  async function getUsers (accounts: Ref<Account>[], search: string): Promise<Person[]> {
+    const query: DocumentQuery<PersonAccount> =
+      isSearch > 0 ? { name: { $like: '%' + search + '%' } } : { _id: { $in: accounts as Ref<PersonAccount>[] } }
+    const employess = await client.findAll(contact.class.PersonAccount, query)
+    members = new Set(employess.filter((p) => accounts.includes(p._id)).map((p) => p.person))
     return await client.findAll(
-      contact.class.Employee,
+      contact.mixin.Employee,
       {
-        _id: { $in: employess.map((e) => e.employee) }
+        _id: { $in: employess.map((e) => e.person as Ref<Employee>) }
       },
       { sort: { name: SortingOrder.Descending } }
     )
   }
 
-  async function add (employee: Ref<Employee>): Promise<void> {
-    const account = await client.findOne(contact.class.EmployeeAccount, { employee })
+  async function add (employee: Ref<Person>): Promise<void> {
+    const account = await client.findOne(contact.class.PersonAccount, { employee })
     if (account === undefined) return
     await client.update(space, {
       $push: {
@@ -64,14 +59,14 @@
     })
   }
 
-  async function removeMember (employee: Ref<Employee>): Promise<void> {
-    const account = await client.findOne(contact.class.EmployeeAccount, { employee })
+  async function removeMember (employee: Ref<Person>): Promise<void> {
+    const account = await client.findOne(contact.class.PersonAccount, { employee })
     if (account === undefined) return
     await client.update(space, { $pull: { members: account._id } })
   }
 
   function openAddMembersPopup () {
-    showPopup(AddMembersPopup, { value: space }, undefined, async (membersIds: Ref<EmployeeAccount>[]) => {
+    showPopup(AddMembersPopup, { value: space }, undefined, async (membersIds: Ref<PersonAccount>[]) => {
       if (membersIds) {
         for (const member of membersIds) {
           if (space.members.includes(member)) continue
diff --git a/plugins/contact-resources/src/components/UserBox.svelte b/plugins/contact-resources/src/components/UserBox.svelte
index 85fd110f48..e868085f33 100644
--- a/plugins/contact-resources/src/components/UserBox.svelte
+++ b/plugins/contact-resources/src/components/UserBox.svelte
@@ -14,8 +14,8 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Contact, getName } from '@hcengineering/contact'
-  import { Class, DocumentQuery, FindOptions, Hierarchy, Ref } from '@hcengineering/core'
+  import contact, { Contact, getName } from '@hcengineering/contact'
+  import { Class, DocumentQuery, FindOptions, Hierarchy, Ref, Doc } from '@hcengineering/core'
   import { Asset, getEmbeddedLabel, IntlString } from '@hcengineering/platform'
   import { getClient, ObjectCreate } from '@hcengineering/presentation'
   import {
@@ -42,6 +42,7 @@
   import UsersPopup from './UsersPopup.svelte'
 
   export let _class: Ref<Class<Contact>>
+  export let _previewClass: Ref<Class<Contact>> = contact.class.Contact
   export let excluded: Ref<Contact>[] | undefined = undefined
   export let options: FindOptions<Contact> | undefined = undefined
   export let docQuery: DocumentQuery<Contact> | undefined = undefined
@@ -61,6 +62,9 @@
   export let showTooltip: LabelAndProps | undefined = undefined
   export let showNavigate = true
   export let id: string | undefined = undefined
+  export let filter: (it: Doc) => boolean = () => {
+    return true
+  }
 
   export let create: ObjectCreate | undefined = undefined
 
@@ -72,7 +76,7 @@
   const client = getClient()
 
   async function updateSelected (value: Ref<Contact> | null | undefined) {
-    selected = value ? await client.findOne(_class, { _id: value }) : undefined
+    selected = value ? await client.findOne(_previewClass, { _id: value }) : undefined
   }
 
   $: updateSelected(value)
@@ -93,7 +97,8 @@
           selected: value,
           titleDeselect,
           placeholder,
-          create
+          create,
+          filter
         },
         !$$slots.content ? container : getEventPositionElement(ev),
         (result) => {
@@ -121,7 +126,9 @@
       class="w-full h-full flex-streatch"
       on:click={_click}
       class:content-color={selected === undefined}
-      use:tooltip={selected !== undefined ? { label: getEmbeddedLabel(getName(selected)) } : undefined}
+      use:tooltip={selected !== undefined
+        ? { label: getEmbeddedLabel(getName(client.getHierarchy(), selected)) }
+        : undefined}
     >
       <slot name="content" />
     </div>
@@ -148,13 +155,15 @@
           style:width={showNavigate && selected
             ? `calc(${width ?? 'min-content'} - 1.5rem)`
             : `${width ?? 'min-content'}`}
-          use:tooltip={selected !== undefined ? { label: getEmbeddedLabel(getName(selected)) } : undefined}
+          use:tooltip={selected !== undefined
+            ? { label: getEmbeddedLabel(getName(client.getHierarchy(), selected)) }
+            : undefined}
         >
           {#if selected}
             {#if hideIcon || selected}
               <UserInfo value={selected} size={avatarSize} {icon} />
             {:else}
-              {getName(selected)}
+              {getName(client.getHierarchy(), selected)}
             {/if}
           {:else}
             <div class="flex-presenter not-selected">
diff --git a/plugins/contact-resources/src/components/UserBoxItems.svelte b/plugins/contact-resources/src/components/UserBoxItems.svelte
index b909a252e3..2efe1a4f2b 100644
--- a/plugins/contact-resources/src/components/UserBoxItems.svelte
+++ b/plugins/contact-resources/src/components/UserBoxItems.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import contact, { Employee } from '@hcengineering/contact'
-  import type { Class, DocumentQuery, IdMap, Ref } from '@hcengineering/core'
+  import type { Class, Doc, DocumentQuery, IdMap, Ref } from '@hcengineering/core'
   import type { IntlString } from '@hcengineering/platform'
   import { Label, showPopup, ActionIcon, IconClose, IconAdd, Icon } from '@hcengineering/ui'
   import type { IconSize } from '@hcengineering/ui'
@@ -23,13 +23,12 @@
   import { employeeByIdStore } from '../utils'
   import UserInfo from './UserInfo.svelte'
   import UsersPopup from './UsersPopup.svelte'
+  import { getClient } from '@hcengineering/presentation'
 
   export let items: Ref<Employee>[] = []
   export let readonlyItems: Ref<Employee>[] = []
-  export let _class: Ref<Class<Employee>> = contact.class.Employee
-  export let docQuery: DocumentQuery<Employee> | undefined = {
-    active: true
-  }
+  export let _class: Ref<Class<Employee>> = contact.mixin.Employee
+  export let docQuery: DocumentQuery<Employee> | undefined = {}
 
   export let label: IntlString | undefined = undefined
   export let actionLabel: IntlString = plugin.string.AddMember
@@ -42,6 +41,8 @@
   let readonlyPersons: Employee[] = getPersons(readonlyItems, $employeeByIdStore)
   $: readonlyPersons = getPersons(readonlyItems, $employeeByIdStore)
 
+  const client = getClient()
+
   const dispatch = createEventDispatcher()
 
   async function addPerson (evt: Event): Promise<void> {
@@ -55,7 +56,13 @@
         allowDeselect: false,
         selectedUsers: items,
         ignoreUsers: readonlyItems,
-        readonly
+        readonly,
+        filter: (it: Doc) => {
+          if (client.getHierarchy().hasMixin(it, contact.mixin.Employee)) {
+            return client.getHierarchy().as(it, contact.mixin.Employee).active
+          }
+          return true
+        }
       },
       evt.target as HTMLElement,
       undefined,
diff --git a/plugins/contact-resources/src/components/UserBoxList.svelte b/plugins/contact-resources/src/components/UserBoxList.svelte
index c6b590dfc6..f648c9605f 100644
--- a/plugins/contact-resources/src/components/UserBoxList.svelte
+++ b/plugins/contact-resources/src/components/UserBoxList.svelte
@@ -14,23 +14,22 @@
 -->
 <script lang="ts">
   import contact, { Employee } from '@hcengineering/contact'
-  import type { Class, DocumentQuery, Ref } from '@hcengineering/core'
+  import type { Class, DocumentQuery, Ref, Doc } from '@hcengineering/core'
   import type { IntlString } from '@hcengineering/platform'
-  import { Button, Label, showPopup } from '@hcengineering/ui'
   import type { ButtonKind, ButtonSize, TooltipAlignment } from '@hcengineering/ui'
+  import { Button, Label, showPopup } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import plugin from '../plugin'
   import { employeeByIdStore } from '../utils'
   import CombineAvatars from './CombineAvatars.svelte'
-  import Members from './icons/Members.svelte'
   import UserInfo from './UserInfo.svelte'
   import UsersPopup from './UsersPopup.svelte'
+  import Members from './icons/Members.svelte'
+  import { getClient } from '@hcengineering/presentation'
 
   export let items: Ref<Employee>[] = []
-  export let _class: Ref<Class<Employee>> = contact.class.Employee
-  export let docQuery: DocumentQuery<Employee> | undefined = {
-    active: true
-  }
+  export let _class: Ref<Class<Employee>> = contact.mixin.Employee
+  export let docQuery: DocumentQuery<Employee> | undefined = {}
 
   export let label: IntlString | undefined = undefined
   export let kind: ButtonKind = 'no-border'
@@ -45,6 +44,7 @@
   $: persons = items.map((p) => $employeeByIdStore.get(p)).filter((p) => p !== undefined) as Employee[]
 
   const dispatch = createEventDispatcher()
+  const client = getClient()
 
   async function addPerson (evt: Event): Promise<void> {
     showPopup(
@@ -56,6 +56,12 @@
         multiSelect: true,
         allowDeselect: false,
         selectedUsers: items,
+        filter: (it: Doc) => {
+          const h = client.getHierarchy()
+          if (h.hasMixin(it, contact.mixin.Employee)) {
+            return h.as(it, contact.mixin.Employee).active
+          }
+        },
         readonly
       },
       evt.target as HTMLElement,
diff --git a/plugins/contact-resources/src/components/UserInfo.svelte b/plugins/contact-resources/src/components/UserInfo.svelte
index 95c9efe0b0..cbe6e857cc 100644
--- a/plugins/contact-resources/src/components/UserInfo.svelte
+++ b/plugins/contact-resources/src/components/UserInfo.svelte
@@ -17,6 +17,7 @@
 
   import { getName, Person } from '@hcengineering/contact'
   import { Asset } from '@hcengineering/platform'
+  import { getClient } from '@hcengineering/presentation'
   import { AnySvelteComponent, IconSize } from '@hcengineering/ui'
 
   export let value: Person
@@ -24,6 +25,8 @@
   export let size: IconSize
   export let icon: Asset | AnySvelteComponent | undefined = undefined
   export let short: boolean = false
+
+  const client = getClient()
 </script>
 
 <!-- svelte-ignore a11y-click-events-have-key-events -->
@@ -31,6 +34,6 @@
   <Avatar avatar={value.avatar} {size} {icon} on:accent-color />
   <div class="flex-col min-w-0 {size === 'tiny' || size === 'inline' ? 'ml-1' : 'ml-2'}" class:max-w-20={short}>
     {#if subtitle}<div class="content-dark-color text-sm">{subtitle}</div>{/if}
-    <div class="label overflow-label text-left">{getName(value)}</div>
+    <div class="label overflow-label text-left">{getName(client.getHierarchy(), value)}</div>
   </div>
 </div>
diff --git a/plugins/contact-resources/src/components/UsersPopup.svelte b/plugins/contact-resources/src/components/UsersPopup.svelte
index c3ad6a09ca..040ab32915 100644
--- a/plugins/contact-resources/src/components/UsersPopup.svelte
+++ b/plugins/contact-resources/src/components/UsersPopup.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Contact, getFirstName, getLastName, Person } from '@hcengineering/contact'
+  import contact, { Contact, getFirstName, getLastName, Person } from '@hcengineering/contact'
   import type { Class, Doc, DocumentQuery, FindOptions, Ref } from '@hcengineering/core'
   import type { Asset, IntlString } from '@hcengineering/platform'
   import presentation, { getClient, ObjectCreate, ObjectPopup } from '@hcengineering/presentation'
@@ -26,6 +26,15 @@
   export let selected: Ref<Person> | undefined
   export let docQuery: DocumentQuery<Contact> | undefined = undefined
 
+  const client = getClient()
+
+  export let filter: (it: Doc) => boolean = (it) => {
+    if (client.getHierarchy().hasMixin(it, contact.mixin.Employee)) {
+      return client.getHierarchy().as(it, contact.mixin.Employee).active
+    }
+    return true
+  }
+
   export let multiSelect: boolean = false
   export let allowDeselect: boolean = false
   export let titleDeselect: IntlString | undefined = undefined
@@ -61,6 +70,7 @@
   {titleDeselect}
   {placeholder}
   {docQuery}
+  {filter}
   groupBy={'_class'}
   bind:selectedObjects={selectedUsers}
   bind:ignoreObjects={ignoreUsers}
diff --git a/plugins/contact-resources/src/components/activity/ActivityChannelPresenter.svelte b/plugins/contact-resources/src/components/activity/ActivityChannelPresenter.svelte
index 38d7b47e2d..5171a4a2c2 100644
--- a/plugins/contact-resources/src/components/activity/ActivityChannelPresenter.svelte
+++ b/plugins/contact-resources/src/components/activity/ActivityChannelPresenter.svelte
@@ -16,7 +16,7 @@
   import contact, { Channel, Contact, getName } from '@hcengineering/contact'
   import { Ref } from '@hcengineering/core'
   import { getEmbeddedLabel } from '@hcengineering/platform'
-  import { createQuery } from '@hcengineering/presentation'
+  import { createQuery, getClient } from '@hcengineering/presentation'
   import { CircleButton, tooltip } from '@hcengineering/ui'
   import { DocNavLink } from '@hcengineering/view-resources'
   import { channelProviders } from '../../utils'
@@ -27,6 +27,8 @@
   let target: Contact | undefined
   const query = createQuery()
   $: query.query(contact.class.Contact, { _id: value.attachedTo as Ref<Contact> }, (res) => ([target] = res))
+
+  const client = getClient()
 </script>
 
 <div class="flex-row-center" use:tooltip={{ label: getEmbeddedLabel(value.value) }}>
@@ -36,7 +38,7 @@
   {#if target}
     <div class="ml-1">
       <DocNavLink object={target}>
-        {getName(target)}
+        {getName(client.getHierarchy(), target)}
       </DocNavLink>
     </div>
   {/if}
diff --git a/plugins/contact-resources/src/index.ts b/plugins/contact-resources/src/index.ts
index ffc7ef12c0..72e793e38e 100644
--- a/plugins/contact-resources/src/index.ts
+++ b/plugins/contact-resources/src/index.ts
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-import { Channel, Contact, Employee, getGravatarUrl, getName } from '@hcengineering/contact'
+import { Channel, Contact, getGravatarUrl, getName, Person } from '@hcengineering/contact'
 import { Class, Client, DocumentQuery, Ref, RelatedDocument, WithLookup } from '@hcengineering/core'
 import login from '@hcengineering/login'
 import { IntlString, Resources, getResource } from '@hcengineering/platform'
@@ -55,9 +55,9 @@ import EditMember from './components/EditMember.svelte'
 import EditOrganization from './components/EditOrganization.svelte'
 import EditPerson from './components/EditPerson.svelte'
 import EditableAvatar from './components/EditableAvatar.svelte'
-import EmployeeAccountFilterValuePresenter from './components/EmployeeAccountFilterValuePresenter.svelte'
-import EmployeeAccountPresenter from './components/EmployeeAccountPresenter.svelte'
-import EmployeeAccountRefPresenter from './components/EmployeeAccountRefPresenter.svelte'
+import PersonAccountFilterValuePresenter from './components/PersonAccountFilterValuePresenter.svelte'
+import PersonAccountPresenter from './components/PersonAccountPresenter.svelte'
+import PersonAccountRefPresenter from './components/PersonAccountRefPresenter.svelte'
 import EmployeeArrayEditor from './components/EmployeeArrayEditor.svelte'
 import EmployeeBox from './components/EmployeeBox.svelte'
 import EmployeeBrowser from './components/EmployeeBrowser.svelte'
@@ -70,7 +70,7 @@ import MemberPresenter from './components/MemberPresenter.svelte'
 import Members from './components/Members.svelte'
 import MembersBox from './components/MembersBox.svelte'
 import MembersPresenter from './components/MembersPresenter.svelte'
-import MergeEmployee from './components/MergeEmployee.svelte'
+import MergePersons from './components/MergePersons.svelte'
 import OrganizationEditor from './components/OrganizationEditor.svelte'
 import OrganizationPresenter from './components/OrganizationPresenter.svelte'
 import PersonEditor from './components/PersonEditor.svelte'
@@ -121,7 +121,7 @@ export {
   EmployeeBrowser,
   MemberPresenter,
   EmployeeEditor,
-  EmployeeAccountRefPresenter,
+  PersonAccountRefPresenter,
   MembersPresenter,
   EditPerson,
   EmployeeRefPresenter,
@@ -148,7 +148,7 @@ export {
 
 const toObjectSearchResult = (e: WithLookup<Contact>): ObjectSearchResult => ({
   doc: e,
-  title: getName(e),
+  title: getName(getClient().getHierarchy(), e),
   icon: Avatar,
   iconProps: { size: 'x-small', avatar: e.avatar },
   component: UserInfo,
@@ -171,13 +171,13 @@ async function queryEmployee (
   filter?: { in?: RelatedDocument[], nin?: RelatedDocument[] }
 ): Promise<ObjectSearchResult[]> {
   const q1 = await doContactQuery(
-    contact.class.Employee,
+    contact.mixin.Employee,
     { name: { $like: `%${search}%` }, active: true },
     filter,
     client
   )
   const q2 = await doContactQuery(
-    contact.class.Employee,
+    contact.mixin.Employee,
     { displayName: { $like: `%${search}%` }, active: true },
     {
       in: filter?.in,
@@ -195,7 +195,7 @@ async function doContactQuery<T extends Contact> (
   filter: { in?: RelatedDocument[] | undefined, nin?: RelatedDocument[] | undefined } | undefined,
   client: Client
 ): Promise<ObjectSearchResult[]> {
-  if (_class === contact.class.Employee) {
+  if (_class === contact.mixin.Employee) {
     q = { ...q, active: true }
   }
   if (filter?.in !== undefined || filter?.nin !== undefined) {
@@ -210,10 +210,12 @@ async function doContactQuery<T extends Contact> (
   return (await client.findAll(_class, q, { limit: 200 })).map(toObjectSearchResult)
 }
 
-async function kickEmployee (doc: Employee): Promise<void> {
+async function kickEmployee (doc: Person): Promise<void> {
   const client = getClient()
-  const email = await client.findOne(contact.class.EmployeeAccount, { employee: doc._id })
-  if (!doc.active) {
+
+  const employee = client.getHierarchy().as(doc, contact.mixin.Employee)
+  const email = await client.findOne(contact.class.PersonAccount, { person: doc._id })
+  if (!employee.active) {
     showPopup(
       MessageBox,
       {
@@ -230,7 +232,7 @@ async function kickEmployee (doc: Employee): Promise<void> {
     return
   }
   if (email === undefined) {
-    await client.update(doc, { active: false })
+    await client.update(employee, { active: false })
   } else {
     showPopup(
       MessageBox,
@@ -288,7 +290,7 @@ export default async (): Promise<Resources> => ({
     SocialEditor,
     Contacts,
     ContactsTabs,
-    EmployeeAccountPresenter,
+    PersonAccountPresenter,
     EmployeePresenter,
     EmployeeRefPresenter,
     Members,
@@ -300,7 +302,7 @@ export default async (): Promise<Resources> => ({
     CreateEmployee,
     AccountArrayEditor,
     ChannelFilter,
-    MergeEmployee,
+    MergePersons,
     Avatar,
     UserBoxList,
     ActivityChannelMessage,
@@ -312,9 +314,9 @@ export default async (): Promise<Resources> => ({
     UserBoxItems,
     EmployeeFilter,
     EmployeeFilterValuePresenter,
-    EmployeeAccountFilterValuePresenter,
+    PersonAccountFilterValuePresenter,
     DeleteConfirmationPopup,
-    EmployeeAccountRefPresenter
+    PersonAccountRefPresenter
   },
   completion: {
     EmployeeQuery: async (
diff --git a/plugins/contact-resources/src/plugin.ts b/plugins/contact-resources/src/plugin.ts
index ca50f82fe3..5c11f93c55 100644
--- a/plugins/contact-resources/src/plugin.ts
+++ b/plugins/contact-resources/src/plugin.ts
@@ -60,10 +60,11 @@ export default mergeIds(contactId, contact, {
     Email: '' as IntlString,
     CreateEmployee: '' as IntlString,
     Inactive: '' as IntlString,
+    Active: '' as IntlString,
     NotSpecified: '' as IntlString,
-    MergeEmployee: '' as IntlString,
-    MergeEmployeeFrom: '' as IntlString,
-    MergeEmployeeTo: '' as IntlString,
+    MergePersons: '' as IntlString,
+    MergePersonsFrom: '' as IntlString,
+    MergePersonsTo: '' as IntlString,
     SelectAvatar: '' as IntlString,
     GravatarsManaged: '' as IntlString,
     Through: '' as IntlString,
diff --git a/plugins/contact-resources/src/utils.ts b/plugins/contact-resources/src/utils.ts
index bbd9a15dc2..9562dd69ee 100644
--- a/plugins/contact-resources/src/utils.ts
+++ b/plugins/contact-resources/src/utils.ts
@@ -18,25 +18,26 @@ import {
   AvatarProvider,
   AvatarType,
   ChannelProvider,
-  Contact,
-  contactId,
   Employee,
-  EmployeeAccount,
+  Contact,
+  PersonAccount,
+  contactId,
   formatName,
   getFirstName,
   getLastName,
-  getName
+  getName,
+  Person
 } from '@hcengineering/contact'
-import { Client, Doc, getCurrentAccount, IdMap, ObjQueryType, Ref, Timestamp, toIdMap } from '@hcengineering/core'
+import { Client, Doc, IdMap, ObjQueryType, Ref, Timestamp, getCurrentAccount, toIdMap } from '@hcengineering/core'
+import notification, { DocUpdateTx, DocUpdates } from '@hcengineering/notification'
+import { getResource } from '@hcengineering/platform'
 import { createQuery, getClient } from '@hcengineering/presentation'
 import { TemplateDataProvider } from '@hcengineering/templates'
-import { TabItem, getCurrentResolvedLocation, getPanelURI, Location, ResolvedLocation } from '@hcengineering/ui'
+import { Location, ResolvedLocation, TabItem, getCurrentResolvedLocation, getPanelURI } from '@hcengineering/ui'
 import view, { Filter } from '@hcengineering/view'
 import { FilterQuery } from '@hcengineering/view-resources'
-import { get, writable } from 'svelte/store'
+import { derived, get, writable } from 'svelte/store'
 import contact from './plugin'
-import notification, { DocUpdates, DocUpdateTx } from '@hcengineering/notification'
-import { getResource } from '@hcengineering/platform'
 
 export function formatDate (dueDateMs: Timestamp): string {
   return new Date(dueDateMs).toLocaleString('default', {
@@ -48,6 +49,7 @@ export function formatDate (dueDateMs: Timestamp): string {
 }
 
 export async function employeeSort (value: Array<Ref<Employee>>): Promise<Array<Ref<Employee>>> {
+  const h = getClient().getHierarchy()
   return value.sort((a, b) => {
     const employeeId1 = a as Ref<Employee> | null | undefined
     const employeeId2 = b as Ref<Employee> | null | undefined
@@ -63,8 +65,8 @@ export async function employeeSort (value: Array<Ref<Employee>>): Promise<Array<
     if (employeeId1 != null && employeeId2 != null) {
       const employee1 = get(employeeByIdStore).get(employeeId1)
       const employee2 = get(employeeByIdStore).get(employeeId2)
-      const name1 = employee1 != null ? getName(employee1) : ''
-      const name2 = employee2 != null ? getName(employee2) : ''
+      const name1 = employee1 != null ? getName(h, employee1) : ''
+      const name2 = employee2 != null ? getName(h, employee2) : ''
 
       return name1.localeCompare(name2)
     }
@@ -137,19 +139,19 @@ export async function getRefs (
 }
 
 export async function getCurrentEmployeeName (): Promise<string> {
-  const me = getCurrentAccount() as EmployeeAccount
+  const me = getCurrentAccount() as PersonAccount
   return formatName(me.name)
 }
 
 export async function getCurrentEmployeeEmail (): Promise<string> {
-  const me = getCurrentAccount() as EmployeeAccount
+  const me = getCurrentAccount() as PersonAccount
   return me.email
 }
 
 export async function getCurrentEmployeePosition (): Promise<string | undefined> {
-  const me = getCurrentAccount() as EmployeeAccount
+  const me = getCurrentAccount() as PersonAccount
   const client = getClient()
-  const employee = await client.findOne(contact.class.Employee, { _id: me.employee })
+  const employee = await client.findOne<Employee>(contact.mixin.Employee, { _id: me.person as Ref<Employee> })
   if (employee !== undefined) {
     return employee.position ?? ''
   }
@@ -161,7 +163,7 @@ export async function getContactName (provider: TemplateDataProvider): Promise<s
   const client = getClient()
   const hierarchy = client.getHierarchy()
   if (hierarchy.isDerived(value._class, contact.class.Person)) {
-    return getName(value)
+    return getName(client.getHierarchy(), value)
   } else {
     return value.name
   }
@@ -234,7 +236,7 @@ async function generateLocation (loc: Location, id: Ref<Contact>): Promise<Resol
   const workspace = loc.path[1] ?? ''
   const special = client.getHierarchy().isDerived(doc._class, contact.class.Organization)
     ? 'companies'
-    : client.getHierarchy().isDerived(doc._class, contact.class.Employee)
+    : client.getHierarchy().isDerived(doc._class, contact.mixin.Employee)
       ? 'employees'
       : 'persons'
   return {
@@ -252,33 +254,43 @@ async function generateLocation (loc: Location, id: Ref<Contact>): Promise<Resol
 export const employeeByIdStore = writable<IdMap<Employee>>(new Map())
 export const employeesStore = writable<Employee[]>([])
 
-export const employeeAccountByIdStore = writable<IdMap<EmployeeAccount>>(new Map())
+export const personAccountByIdStore = writable<IdMap<PersonAccount>>(new Map())
 
 export const channelProviders = writable<ChannelProvider[]>([])
 
+export const personAccountPersonByIdStore = writable<IdMap<Person>>(new Map())
+
+export const personByIdStore = derived([personAccountPersonByIdStore, employeeByIdStore], (vals) => {
+  const m1 = Array.from(vals[0].entries())
+  const m2 = Array.from(vals[1].entries())
+  return new Map([...m1, ...m2])
+})
+
 function fillStores (): void {
   const client = getClient()
+
   if (client !== undefined) {
+    const accountPersonQuery = createQuery(true)
+
     const query = createQuery(true)
-    query.query(contact.class.Employee, {}, (res) => {
+    query.query(contact.mixin.Employee, {}, (res) => {
       employeesStore.set(res)
       employeeByIdStore.set(toIdMap(res))
     })
 
     const accountQ = createQuery(true)
-    accountQ.query(contact.class.EmployeeAccount, {}, (res) => {
-      const mergedEmployees = res.filter((it) => it.mergedTo !== undefined)
-      const activeEmployees = res.filter((it) => it.mergedTo === undefined)
-      const ids = toIdMap(activeEmployees)
-      for (const e of mergedEmployees) {
-        if (e.mergedTo !== undefined) {
-          const mergeTo = ids.get(e.mergedTo)
-          if (mergeTo !== undefined) {
-            ids.set(e._id, mergeTo)
-          }
+    accountQ.query(contact.class.PersonAccount, {}, (res) => {
+      personAccountByIdStore.set(toIdMap(res))
+
+      const persons = res.map((it) => it.person)
+
+      accountPersonQuery.query(
+        contact.class.Person,
+        { _id: { $in: persons }, [contact.mixin.Employee]: { $exists: false } },
+        (res) => {
+          personAccountPersonByIdStore.set(toIdMap(res))
         }
-      }
-      employeeAccountByIdStore.set(ids)
+      )
     })
 
     const providerQuery = createQuery(true)
@@ -332,5 +344,5 @@ export function getAvatarProviderId (avatar?: string | null): Ref<AvatarProvider
 export async function contactTitleProvider (client: Client, ref: Ref<Contact>): Promise<string> {
   const object = await client.findOne(contact.class.Contact, { _id: ref })
   if (object === undefined) return ''
-  return getName(object)
+  return getName(client.getHierarchy(), object)
 }
diff --git a/plugins/contact/src/index.ts b/plugins/contact/src/index.ts
index cd0ecb7c3a..15df6d41bd 100644
--- a/plugins/contact/src/index.ts
+++ b/plugins/contact/src/index.ts
@@ -138,7 +138,6 @@ export interface Status extends AttachedDoc {
  */
 export interface Employee extends Person {
   active: boolean
-  mergedTo?: Ref<Employee>
   statuses?: number
   displayName?: string | null
   position?: string | null
@@ -147,9 +146,8 @@ export interface Employee extends Person {
 /**
  * @public
  */
-export interface EmployeeAccount extends Account {
-  employee: Ref<Employee>
-  mergedTo?: Ref<EmployeeAccount>
+export interface PersonAccount extends Account {
+  person: Ref<Person>
 }
 
 /**
@@ -180,11 +178,13 @@ export const contactPlugin = plugin(contactId, {
     Member: '' as Ref<Class<Member>>,
     Organization: '' as Ref<Class<Organization>>,
     Organizations: '' as Ref<Class<Organizations>>,
-    Employee: '' as Ref<Class<Employee>>,
-    EmployeeAccount: '' as Ref<Class<EmployeeAccount>>,
+    PersonAccount: '' as Ref<Class<PersonAccount>>,
     Status: '' as Ref<Class<Status>>,
     ContactsTab: '' as Ref<Class<ContactsTab>>
   },
+  mixin: {
+    Employee: '' as Ref<Class<Employee>>
+  },
   component: {
     SocialEditor: '' as AnyComponent,
     CreateOrganization: '' as AnyComponent,
diff --git a/plugins/contact/src/utils.ts b/plugins/contact/src/utils.ts
index 82cfcaee3e..b0ce49c937 100644
--- a/plugins/contact/src/utils.ts
+++ b/plugins/contact/src/utils.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import { AttachedData, Class, Client, Doc, FindResult, Ref } from '@hcengineering/core'
+import { AttachedData, Class, Client, Doc, FindResult, Ref, Hierarchy } from '@hcengineering/core'
 import { IconSize } from '@hcengineering/ui'
 import { MD5 } from 'crypto-js'
 import { Channel, Contact, contactPlugin, Employee, Person } from '.'
@@ -211,9 +211,9 @@ export function formatName (name: string): string {
 /**
  * @public
  */
-export function getName (value: Contact): string {
-  if (isEmployee(value)) {
-    return value.displayName ?? formatName(value.name)
+export function getName (hierarchy: Hierarchy, value: Contact): string {
+  if (isEmployee(hierarchy, value)) {
+    return hierarchy.as(value, contactPlugin.mixin.Employee).displayName ?? formatName(value.name)
   }
   if (isPerson(value)) {
     return formatName(value.name)
@@ -221,8 +221,8 @@ export function getName (value: Contact): string {
   return value.name
 }
 
-function isEmployee (value: Contact): value is Employee {
-  return value._class === contactPlugin.class.Employee
+function isEmployee (hierarchy: Hierarchy, value: Contact): value is Employee {
+  return hierarchy.hasMixin(value, contactPlugin.mixin.Employee)
 }
 
 function isPerson (value: Contact): value is Person {
diff --git a/plugins/document-resources/src/components/CreateDocument.svelte b/plugins/document-resources/src/components/CreateDocument.svelte
index c42dba296d..619f33ddf2 100644
--- a/plugins/document-resources/src/components/CreateDocument.svelte
+++ b/plugins/document-resources/src/components/CreateDocument.svelte
@@ -15,7 +15,7 @@
 //
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { Employee, PersonAccount } from '@hcengineering/contact'
   import { Data, generateId, getCurrentAccount, Ref } from '@hcengineering/core'
   import { CollaboratorDocument, Document, DocumentVersionState } from '@hcengineering/document'
   import { Card, getClient } from '@hcengineering/presentation'
@@ -29,7 +29,7 @@
   }
 
   const id = generateId()
-  const currentUser = getCurrentAccount() as EmployeeAccount
+  const currentUser = getCurrentAccount() as PersonAccount
 
   const object: Data<Document> = {
     name: '',
@@ -40,7 +40,7 @@
     version: 0,
     latest: 0.1,
     approvers: [],
-    authors: [currentUser.employee],
+    authors: [currentUser.person as Ref<Employee>],
     reviewers: [],
     requests: 0
   }
diff --git a/plugins/document-resources/src/components/EditDoc.svelte b/plugins/document-resources/src/components/EditDoc.svelte
index 7cbc89eb68..7c7294c7a4 100644
--- a/plugins/document-resources/src/components/EditDoc.svelte
+++ b/plugins/document-resources/src/components/EditDoc.svelte
@@ -16,7 +16,7 @@
 -->
 <script lang="ts">
   import { Attachments } from '@hcengineering/attachment-resources'
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { Employee, PersonAccount } from '@hcengineering/contact'
   import core, { Class, Doc, generateId, getCurrentAccount, Ref, WithLookup } from '@hcengineering/core'
   import {
     CollaboratorDocument,
@@ -85,7 +85,7 @@
     }
   }
 
-  const currentUser = getCurrentAccount() as EmployeeAccount
+  const currentUser = getCurrentAccount() as PersonAccount
 
   onDestroy(async () => {
     notificationClient.then((client) => client.read(_id))
@@ -93,7 +93,7 @@
 
   let requests: DocumentRequest[] = []
 
-  $: myRequests = requests.filter((it) => it.assignee === currentUser.employee)
+  $: myRequests = requests.filter((it) => it.assignee === currentUser.person)
 
   $: approveRequest = myRequests.find((it) => it.kind === DocumentRequestKind.Approve)
   $: allApproveRequest = requests.find((it) => it.kind === DocumentRequestKind.Approve)
@@ -229,7 +229,7 @@
     )
   }
 
-  $: readonly = !documentObject?.authors.includes(currentUser.employee)
+  $: readonly = !documentObject?.authors.includes(currentUser.person as Ref<Employee>)
 
   let autoSelect = true
 
diff --git a/plugins/document-resources/src/components/MyDocuments.svelte b/plugins/document-resources/src/components/MyDocuments.svelte
index a08b135644..3405511314 100644
--- a/plugins/document-resources/src/components/MyDocuments.svelte
+++ b/plugins/document-resources/src/components/MyDocuments.svelte
@@ -1,9 +1,9 @@
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
-  import { getCurrentAccount } from '@hcengineering/core'
+  import { Employee, PersonAccount } from '@hcengineering/contact'
+  import { Ref, getCurrentAccount } from '@hcengineering/core'
   import Documents from './Documents.svelte'
 
-  const currentUser = getCurrentAccount() as EmployeeAccount
+  const currentUser = (getCurrentAccount() as PersonAccount).person as Ref<Employee>
 </script>
 
-<Documents query={{ authors: currentUser.employee }} />
+<Documents query={{ authors: currentUser }} />
diff --git a/plugins/gmail-resources/src/components/Chats.svelte b/plugins/gmail-resources/src/components/Chats.svelte
index c70849e5b2..86add6b5d5 100644
--- a/plugins/gmail-resources/src/components/Chats.svelte
+++ b/plugins/gmail-resources/src/components/Chats.svelte
@@ -15,7 +15,7 @@
 -->
 <script lang="ts">
   import { Channel, Contact } from '@hcengineering/contact'
-  import { employeeAccountByIdStore, employeeByIdStore } from '@hcengineering/contact-resources'
+  import { personAccountByIdStore, employeeByIdStore } from '@hcengineering/contact-resources'
   import { Ref, SortingOrder } from '@hcengineering/core'
   import { Message, SharedMessage } from '@hcengineering/gmail'
   import { NotificationClientImpl } from '@hcengineering/notification-resources'
@@ -80,7 +80,7 @@
       object._class,
       'gmailSharedMessages',
       {
-        messages: convertMessages(object, channel, selectedMessages, $employeeAccountByIdStore, $employeeByIdStore)
+        messages: convertMessages(object, channel, selectedMessages, $personAccountByIdStore, $employeeByIdStore)
       }
     )
     await notificationClient.read(channel._id)
@@ -138,7 +138,7 @@
   <div class="popupPanel-body__main-content py-4 clear-mins flex-no-shrink">
     {#if messages && messages.length > 0}
       <Messages
-        messages={convertMessages(object, channel, messages, $employeeAccountByIdStore, $employeeByIdStore)}
+        messages={convertMessages(object, channel, messages, $personAccountByIdStore, $employeeByIdStore)}
         {selectable}
         bind:selected
         on:select
diff --git a/plugins/gmail-resources/src/components/Main.svelte b/plugins/gmail-resources/src/components/Main.svelte
index d052445b26..b283bd9922 100644
--- a/plugins/gmail-resources/src/components/Main.svelte
+++ b/plugins/gmail-resources/src/components/Main.svelte
@@ -20,7 +20,7 @@
   import { Message, SharedMessage } from '@hcengineering/gmail'
   import { NotificationClientImpl } from '@hcengineering/notification-resources'
   import { getResource } from '@hcengineering/platform'
-  import { createQuery } from '@hcengineering/presentation'
+  import { createQuery, getClient } from '@hcengineering/presentation'
   import setting, { Integration } from '@hcengineering/setting'
   import templates, { TemplateDataProvider } from '@hcengineering/templates'
   import { Button, Icon, Label, Panel, eventToHTMLElement, showPopup } from '@hcengineering/ui'
@@ -37,6 +37,8 @@
   export let embedded = false
   export let message: Message | undefined = undefined
 
+  const client = getClient()
+
   let object: Contact
   let currentMessage: SharedMessage | undefined = undefined
 
@@ -108,7 +110,7 @@
         <div class="title-wrapper">
           <span class="wrapped-title">Email</span>
           <span class="wrapped-subtitle">
-            <b>{getName(object)}</b>
+            <b>{getName(client.getHierarchy(), object)}</b>
           </span>
         </div>
       </div>
diff --git a/plugins/gmail-resources/src/components/NewMessage.svelte b/plugins/gmail-resources/src/components/NewMessage.svelte
index 9159ac0fee..e721293f6f 100644
--- a/plugins/gmail-resources/src/components/NewMessage.svelte
+++ b/plugins/gmail-resources/src/components/NewMessage.svelte
@@ -179,7 +179,7 @@
       />
       <div class="flex-grow flex-col">
         <Label label={plugin.string.NewMessage} />
-        <span class="content-color"><b>{getName(object)} ({channel.value})</b></span>
+        <span class="content-color"><b>{getName(client.getHierarchy(), object)} ({channel.value})</b></span>
       </div>
     </div>
     <div class="buttons-group small-gap">
diff --git a/plugins/gmail-resources/src/components/NewMessages.svelte b/plugins/gmail-resources/src/components/NewMessages.svelte
index c25cc0dd8f..bb145f7385 100644
--- a/plugins/gmail-resources/src/components/NewMessages.svelte
+++ b/plugins/gmail-resources/src/components/NewMessages.svelte
@@ -188,7 +188,7 @@
   function getName (channel: Channel): string {
     const contact = contactMap.get(channel.attachedTo as Ref<Contact>)
     if (contact === undefined) return channel.value
-    return `${getContactName(contact)} (${channel.value})`
+    return `${getContactName(client.getHierarchy(), contact)} (${channel.value})`
   }
 
   const settingsQuery = createQuery()
diff --git a/plugins/gmail-resources/src/utils.ts b/plugins/gmail-resources/src/utils.ts
index 2f383c0409..aa80e5d348 100644
--- a/plugins/gmail-resources/src/utils.ts
+++ b/plugins/gmail-resources/src/utils.ts
@@ -1,4 +1,4 @@
-import contact, { Channel, Contact, Employee, EmployeeAccount, getName as getContactName } from '@hcengineering/contact'
+import contact, { Channel, Employee, Contact, PersonAccount, getName as getContactName } from '@hcengineering/contact'
 import { Doc, IdMap, Ref, toIdMap } from '@hcengineering/core'
 import { Message, SharedMessage } from '@hcengineering/gmail'
 import { getClient } from '@hcengineering/presentation'
@@ -65,7 +65,7 @@ export function convertMessages (
   object: Contact,
   channel: Channel,
   messages: Message[],
-  accounts: IdMap<EmployeeAccount>,
+  accounts: IdMap<PersonAccount>,
   employees: IdMap<Employee>
 ): SharedMessage[] {
   return messages.map((m) => {
@@ -85,7 +85,7 @@ export async function convertMessage (
   employees: IdMap<Employee>
 ): Promise<SharedMessage> {
   const client = getClient()
-  const accounts = toIdMap(await client.findAll(contact.class.EmployeeAccount, {}))
+  const accounts = toIdMap(await client.findAll(contact.class.PersonAccount, {}))
   return {
     ...message,
     _id: message._id as string as Ref<SharedMessage>,
@@ -98,18 +98,19 @@ export function getName (
   object: Contact,
   channel: Channel,
   message: Message,
-  accounts: IdMap<EmployeeAccount>,
+  accounts: IdMap<PersonAccount>,
   employees: IdMap<Employee>,
   sender: boolean
 ): string {
+  const h = getClient().getHierarchy()
   if (message.incoming === sender) {
-    return `${getContactName(object)} (${channel.value})`
+    return `${getContactName(h, object)} (${channel.value})`
   } else {
-    const account = accounts.get(message.modifiedBy as Ref<EmployeeAccount>)
-    const emp = account != null ? employees.get(account?.employee) : undefined
+    const account = accounts.get(message.modifiedBy as Ref<PersonAccount>)
+    const emp = account != null ? employees.get(account?.person as Ref<Employee>) : undefined
     const value = message.incoming ? message.to : message.from
     const email = value.match(EMAIL_REGEX)
     const emailVal = email?.[0] ?? value
-    return emp != null ? `${getContactName(emp)} (${emailVal})` : emailVal
+    return emp != null ? `${getContactName(h, emp)} (${emailVal})` : emailVal
   }
 }
diff --git a/plugins/hr-resources/src/components/DepartmentCard.svelte b/plugins/hr-resources/src/components/DepartmentCard.svelte
index 357fdf6680..248b24e2ef 100644
--- a/plugins/hr-resources/src/components/DepartmentCard.svelte
+++ b/plugins/hr-resources/src/components/DepartmentCard.svelte
@@ -62,7 +62,7 @@
     showPopup(
       UsersPopup,
       {
-        _class: contact.class.Employee,
+        _class: contact.mixin.Employee,
         selected: value.$lookup?.teamLead,
         allowDeselect: true,
         placeholder: hr.string.TeamLead,
diff --git a/plugins/hr-resources/src/components/DepartmentStaff.svelte b/plugins/hr-resources/src/components/DepartmentStaff.svelte
index acf2ed92bd..0c76d26141 100644
--- a/plugins/hr-resources/src/components/DepartmentStaff.svelte
+++ b/plugins/hr-resources/src/components/DepartmentStaff.svelte
@@ -44,7 +44,7 @@
     showPopup(
       UsersPopup,
       {
-        _class: contact.class.Employee,
+        _class: contact.mixin.Employee,
         docQuery: {
           active: true
         },
diff --git a/plugins/hr-resources/src/components/Schedule.svelte b/plugins/hr-resources/src/components/Schedule.svelte
index be20fd353b..810772e476 100644
--- a/plugins/hr-resources/src/components/Schedule.svelte
+++ b/plugins/hr-resources/src/components/Schedule.svelte
@@ -15,7 +15,7 @@
 <script lang="ts">
   import { CalendarMode } from '@hcengineering/calendar-resources'
   import calendar from '@hcengineering/calendar-resources/src/plugin'
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { Employee, PersonAccount } from '@hcengineering/contact'
   import { employeeByIdStore } from '@hcengineering/contact-resources'
   import { DocumentQuery, getCurrentAccount, Ref } from '@hcengineering/core'
   import { Department, Staff } from '@hcengineering/hr'
@@ -31,7 +31,7 @@
 
   export let visibileNav = true
 
-  const accountEmployee = $employeeByIdStore.get((getCurrentAccount() as EmployeeAccount).employee)
+  const accountEmployee = $employeeByIdStore.get((getCurrentAccount() as PersonAccount).person as Ref<Employee>)
   let accountStaff: Staff | undefined
 
   const accountStaffQ = createQuery()
diff --git a/plugins/hr-resources/src/components/ScheduleView.svelte b/plugins/hr-resources/src/components/ScheduleView.svelte
index 0855d91125..e8c0eca122 100644
--- a/plugins/hr-resources/src/components/ScheduleView.svelte
+++ b/plugins/hr-resources/src/components/ScheduleView.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { CalendarMode } from '@hcengineering/calendar-resources'
-  import { Employee, EmployeeAccount } from '@hcengineering/contact'
+  import { Employee, PersonAccount } from '@hcengineering/contact'
   import contact from '@hcengineering/contact-resources/src/plugin'
   import { DocumentQuery, getCurrentAccount, Ref } from '@hcengineering/core'
   import { Department, fromTzDate, Request, RequestType, Staff } from '@hcengineering/hr'
@@ -52,7 +52,7 @@
   const lq = createQuery()
   const typeQuery = createQuery()
   const staffQ = createQuery()
-  const currentEmployee = (getCurrentAccount() as EmployeeAccount).employee
+  const currentEmployee = (getCurrentAccount() as PersonAccount).person
 
   let staff: Staff[] = []
   let requests: Request[] = []
@@ -265,7 +265,7 @@
     const map = new Map<Ref<Staff>, Department[]>()
     if (departmentStaff && departmentStaff.length > 0) {
       const ids = departmentStaff.map((staff) => staff._id)
-      const staffs = await client.findAll(contact.class.EmployeeAccount, { employee: { $in: ids } })
+      const staffs = await client.findAll(contact.class.PersonAccount, { employee: { $in: ids } })
       const departments = await client.findAll(hr.class.Department, {
         members: { $in: staffs.map((staff) => staff._id) }
       })
diff --git a/plugins/hr-resources/src/components/Structure.svelte b/plugins/hr-resources/src/components/Structure.svelte
index 42f43281d0..b1d6707002 100644
--- a/plugins/hr-resources/src/components/Structure.svelte
+++ b/plugins/hr-resources/src/components/Structure.svelte
@@ -67,7 +67,7 @@
     },
     {
       lookup: {
-        teamLead: contact.class.Employee
+        teamLead: contact.mixin.Employee
       }
     }
   )
diff --git a/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte b/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte
index e528f1f920..2e728bf85b 100644
--- a/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte
+++ b/plugins/hr-resources/src/components/schedule/ReportsPopup.svelte
@@ -30,7 +30,7 @@
   const options: FindOptions<TimeSpendReport> = {
     lookup: {
       attachedTo: tracker.class.Issue,
-      employee: contact.class.Employee
+      employee: contact.mixin.Employee
     },
     sort: {
       date: -1
diff --git a/plugins/hr-resources/src/components/schedule/StaffPresenter.svelte b/plugins/hr-resources/src/components/schedule/StaffPresenter.svelte
index 68d24df781..314c0365e7 100644
--- a/plugins/hr-resources/src/components/schedule/StaffPresenter.svelte
+++ b/plugins/hr-resources/src/components/schedule/StaffPresenter.svelte
@@ -38,7 +38,7 @@
       </div>
       <div class="flex-col">
         <div class="member-title fs-title">
-          {getName(value)}
+          {getName(client.getHierarchy(), value)}
         </div>
         {#await getDepartment(value) then department}
           {#if department}
diff --git a/plugins/hr-resources/src/utils.ts b/plugins/hr-resources/src/utils.ts
index c643329534..33e81e32f6 100644
--- a/plugins/hr-resources/src/utils.ts
+++ b/plugins/hr-resources/src/utils.ts
@@ -30,7 +30,7 @@ export async function addMember (client: TxOperations, employee?: Employee, valu
           MessageBox,
           {
             label: hr.string.MoveStaff,
-            labelProps: { name: getName(employee) },
+            labelProps: { name: getName(client.getHierarchy(), employee) },
             message: hr.string.MoveStaffDescr,
             params: {
               current: current.name,
diff --git a/plugins/hr/src/index.ts b/plugins/hr/src/index.ts
index af93eac118..e1f6580319 100644
--- a/plugins/hr/src/index.ts
+++ b/plugins/hr/src/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import type { Contact, Employee, EmployeeAccount } from '@hcengineering/contact'
+import type { Contact, Employee, PersonAccount } from '@hcengineering/contact'
 import type { Arr, AttachedDoc, Class, Doc, Markup, Mixin, Ref, Space, Type } from '@hcengineering/core'
 import type { Asset, IntlString, Plugin } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
@@ -38,7 +38,7 @@ export interface Department extends Space {
 /**
  * @public
  */
-export interface DepartmentMember extends EmployeeAccount {}
+export interface DepartmentMember extends PersonAccount {}
 
 /**
  * @public
diff --git a/plugins/lead-resources/src/components/KanbanCard.svelte b/plugins/lead-resources/src/components/KanbanCard.svelte
index 88d02f3400..21248221d4 100644
--- a/plugins/lead-resources/src/components/KanbanCard.svelte
+++ b/plugins/lead-resources/src/components/KanbanCard.svelte
@@ -96,7 +96,7 @@
       <AssigneePresenter
         value={object.assignee}
         issueId={object._id}
-        defaultClass={contact.class.Employee}
+        defaultClass={contact.mixin.Employee}
         currentSpace={object.space}
         placeholderLabel={assigneeAttribute.label}
       />
diff --git a/plugins/lead-resources/src/components/MyLeads.svelte b/plugins/lead-resources/src/components/MyLeads.svelte
index 8d81773e29..12eb33ec0e 100644
--- a/plugins/lead-resources/src/components/MyLeads.svelte
+++ b/plugins/lead-resources/src/components/MyLeads.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { AttachedDoc, Class, DocumentQuery, getCurrentAccount, Ref } from '@hcengineering/core'
   import { Lead } from '@hcengineering/lead'
   import { IntlString } from '@hcengineering/platform'
@@ -31,8 +31,8 @@
 
   let search = ''
   const dispatch = createEventDispatcher()
-  const currentUser = getCurrentAccount() as EmployeeAccount
-  const assigned = { assignee: currentUser.employee }
+  const currentUser = getCurrentAccount() as PersonAccount
+  const assigned = { assignee: currentUser.person }
   const created = { createdBy: currentUser._id }
   let subscribed = { _id: { $in: [] as Ref<Lead>[] } }
   let mode: string | undefined = undefined
diff --git a/plugins/notification-resources/src/components/BrowserNotificatator.svelte b/plugins/notification-resources/src/components/BrowserNotificatator.svelte
index 6af0ff8c61..1c18737f00 100644
--- a/plugins/notification-resources/src/components/BrowserNotificatator.svelte
+++ b/plugins/notification-resources/src/components/BrowserNotificatator.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { getCurrentAccount, Ref } from '@hcengineering/core'
   import {
     NotificationProvider,
@@ -64,7 +64,7 @@
     query.query(
       notification.class.Notification,
       {
-        attachedTo: (getCurrentAccount() as EmployeeAccount).employee,
+        attachedTo: (getCurrentAccount() as PersonAccount).person,
         status: { $nin: [NotificationStatus.Read] }
       },
       (res) => {
diff --git a/plugins/notification-resources/src/components/EmployeeInbox.svelte b/plugins/notification-resources/src/components/EmployeeInbox.svelte
index 5396d796e3..802a3238c6 100644
--- a/plugins/notification-resources/src/components/EmployeeInbox.svelte
+++ b/plugins/notification-resources/src/components/EmployeeInbox.svelte
@@ -16,8 +16,8 @@
   import activity, { TxViewlet } from '@hcengineering/activity'
   import { activityKey, ActivityKey } from '@hcengineering/activity-resources'
   import chunter from '@hcengineering/chunter'
-  import { Employee, EmployeeAccount, getName } from '@hcengineering/contact'
-  import { Avatar, employeeAccountByIdStore, employeeByIdStore } from '@hcengineering/contact-resources'
+  import { Employee, getName, PersonAccount } from '@hcengineering/contact'
+  import { Avatar, employeeByIdStore, personAccountByIdStore } from '@hcengineering/contact-resources'
   import core, { Account, Doc, getCurrentAccount, Ref } from '@hcengineering/core'
   import notification, { DocUpdates } from '@hcengineering/notification'
   import { ActionContext, createQuery, getClient } from '@hcengineering/presentation'
@@ -125,8 +125,8 @@
 
   let employee: Employee | undefined = undefined
   $: newTxes = docs.reduce((acc, cur) => acc + cur.txes.filter((p) => p.isNew).length, 0) // items.length
-  $: account = $employeeAccountByIdStore.get(accountId as Ref<EmployeeAccount>)
-  $: employee = account ? $employeeByIdStore.get(account.employee) : undefined
+  $: account = $personAccountByIdStore.get(accountId as Ref<PersonAccount>)
+  $: employee = account ? $employeeByIdStore.get(account.person as Ref<Employee>) : undefined
 
   const client = getClient()
 
@@ -186,7 +186,7 @@
     </div>
     {#if employee}
       <Avatar size="smaller" avatar={employee.avatar} />
-      <span class="font-medium mx-2">{getName(employee)}</span>
+      <span class="font-medium mx-2">{getName(client.getHierarchy(), employee)}</span>
     {/if}
     {#if newTxes > 0}
       <span class="counter">
diff --git a/plugins/notification-resources/src/components/Inbox.svelte b/plugins/notification-resources/src/components/Inbox.svelte
index 19a2953658..1841b2a4b5 100644
--- a/plugins/notification-resources/src/components/Inbox.svelte
+++ b/plugins/notification-resources/src/components/Inbox.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import chunter from '@hcengineering/chunter'
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { Class, Doc, Ref } from '@hcengineering/core'
   import { DocUpdates } from '@hcengineering/notification'
   import { getClient } from '@hcengineering/presentation'
@@ -48,7 +48,7 @@
   let component: AnyComponent | undefined
   let _id: Ref<Doc> | undefined
   let _class: Ref<Class<Doc>> | undefined
-  let selectedEmployee: Ref<EmployeeAccount> | undefined = undefined
+  let selectedEmployee: Ref<PersonAccount> | undefined = undefined
   let prevValue: DocUpdates | undefined = undefined
 
   async function select (value: DocUpdates | undefined) {
diff --git a/plugins/notification-resources/src/components/People.svelte b/plugins/notification-resources/src/components/People.svelte
index 767cfb8843..4cdc15e1bc 100644
--- a/plugins/notification-resources/src/components/People.svelte
+++ b/plugins/notification-resources/src/components/People.svelte
@@ -15,8 +15,8 @@
 <script lang="ts">
   import activity, { TxViewlet } from '@hcengineering/activity'
   import { activityKey, ActivityKey } from '@hcengineering/activity-resources'
-  import { EmployeeAccount } from '@hcengineering/contact'
-  import { employeeAccountByIdStore } from '@hcengineering/contact-resources'
+  import { PersonAccount } from '@hcengineering/contact'
+  import { personAccountByIdStore } from '@hcengineering/contact-resources'
   import { Account, Doc, getCurrentAccount, Ref } from '@hcengineering/core'
   import notification, { DocUpdates } from '@hcengineering/notification'
   import { createQuery } from '@hcengineering/presentation'
@@ -31,7 +31,7 @@
 
   let docs: DocUpdates[] = []
   let map: Map<Ref<Account>, DocUpdates[]> = new Map()
-  let accounts: EmployeeAccount[] = []
+  let accounts: PersonAccount[] = []
   let loading = true
 
   $: query.query(
@@ -88,8 +88,8 @@
     }
     map = map
     accounts = Array.from(map.keys())
-      .map((p) => $employeeAccountByIdStore.get(p as Ref<EmployeeAccount>))
-      .filter((p) => p !== undefined) as EmployeeAccount[]
+      .map((p) => $personAccountByIdStore.get(p as Ref<PersonAccount>))
+      .filter((p) => p !== undefined) as PersonAccount[]
     if (_id === undefined) {
       changeSelected(selected)
     } else {
diff --git a/plugins/notification-resources/src/components/PeopleNotificationsView.svelte b/plugins/notification-resources/src/components/PeopleNotificationsView.svelte
index b1cd4a7044..4fa89a000f 100644
--- a/plugins/notification-resources/src/components/PeopleNotificationsView.svelte
+++ b/plugins/notification-resources/src/components/PeopleNotificationsView.svelte
@@ -15,8 +15,8 @@
 <script lang="ts">
   import { TxViewlet } from '@hcengineering/activity'
   import { ActivityKey } from '@hcengineering/activity-resources'
-  import { EmployeeAccount, getName } from '@hcengineering/contact'
-  import { Avatar, employeeByIdStore } from '@hcengineering/contact-resources'
+  import { PersonAccount, getName } from '@hcengineering/contact'
+  import { Avatar, personByIdStore } from '@hcengineering/contact-resources'
   import core, { Doc, TxCUD, TxProcessor } from '@hcengineering/core'
   import notification, { DocUpdates } from '@hcengineering/notification'
   import { getResource } from '@hcengineering/platform'
@@ -27,14 +27,14 @@
   import TxView from './TxView.svelte'
   import ArrowRight from './icons/ArrowRight.svelte'
 
-  export let value: EmployeeAccount
+  export let value: PersonAccount
   export let items: DocUpdates[]
   export let viewlets: Map<ActivityKey, TxViewlet>
   export let selected: boolean
 
   $: firstItem = items[0]
 
-  $: employee = $employeeByIdStore.get(value.employee)
+  $: employee = $personByIdStore.get(value.person)
 
   $: newTxes = items.reduce((acc, cur) => acc + cur.txes.filter((p) => p.isNew && p.modifiedBy === value._id).length, 0) // items.length
   const dispatch = createEventDispatcher()
@@ -89,7 +89,7 @@
       <div class="flex-row-center gap-2">
         <Avatar avatar={employee?.avatar} size="small" />
         {#if employee}
-          <span class="font-medium">{getName(employee)}</span>
+          <span class="font-medium">{getName(client.getHierarchy(), employee)}</span>
         {:else}
           <span class="font-medium"><Label label={core.string.System} /></span>
         {/if}
diff --git a/plugins/notification-resources/src/components/TxView.svelte b/plugins/notification-resources/src/components/TxView.svelte
index 4f7f2d96cc..f6836f4ff0 100644
--- a/plugins/notification-resources/src/components/TxView.svelte
+++ b/plugins/notification-resources/src/components/TxView.svelte
@@ -24,8 +24,8 @@
   import activity from '@hcengineering/activity-resources/src/plugin'
   import attachment from '@hcengineering/attachment'
   import chunter from '@hcengineering/chunter'
-  import { Employee, EmployeeAccount } from '@hcengineering/contact'
-  import { Avatar, employeeAccountByIdStore, employeeByIdStore } from '@hcengineering/contact-resources'
+  import { Person, PersonAccount } from '@hcengineering/contact'
+  import { Avatar, personAccountByIdStore, personByIdStore } from '@hcengineering/contact-resources'
   import core, { AnyAttribute, Class, Doc, Ref, TxCUD } from '@hcengineering/core'
   import { Asset } from '@hcengineering/platform'
   import { getClient } from '@hcengineering/presentation'
@@ -42,8 +42,8 @@
   let viewlet: TxDisplayViewlet | undefined
   let props: any
 
-  let account: EmployeeAccount | undefined
-  let employee: Employee | undefined
+  let account: PersonAccount | undefined
+  let employee: Person | undefined
   let model: AttributeModel[] = []
   let iconComponent: AnyComponent | undefined = undefined
   let modelIcon: Asset | undefined = undefined
@@ -74,8 +74,8 @@
       }
     })
 
-  $: account = $employeeAccountByIdStore.get(tx.modifiedBy as Ref<EmployeeAccount>)
-  $: employee = account ? $employeeByIdStore.get(account?.employee) : undefined
+  $: account = $personAccountByIdStore.get(tx.modifiedBy as Ref<PersonAccount>)
+  $: employee = account ? $personByIdStore.get(account?.person) : undefined
 
   function isMessageType (attr?: AnyAttribute): boolean {
     return attr?.type._class === core.class.TypeMarkup
diff --git a/plugins/notification-resources/src/components/activity/TxCollaboratorsChange.svelte b/plugins/notification-resources/src/components/activity/TxCollaboratorsChange.svelte
index 7049d72190..079d3d1baa 100644
--- a/plugins/notification-resources/src/components/activity/TxCollaboratorsChange.svelte
+++ b/plugins/notification-resources/src/components/activity/TxCollaboratorsChange.svelte
@@ -13,8 +13,8 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
-  import { EmployeeAccountRefPresenter } from '@hcengineering/contact-resources'
+  import { PersonAccount } from '@hcengineering/contact'
+  import { PersonAccountRefPresenter } from '@hcengineering/contact-resources'
   import { Doc, Ref, TxMixin } from '@hcengineering/core'
   import { Collaborators } from '@hcengineering/notification'
   import { getClient } from '@hcengineering/presentation'
@@ -26,27 +26,27 @@
   export let prevValue: Collaborators | undefined = undefined
 
   interface Diff {
-    added: Ref<EmployeeAccount>[]
-    removed: Ref<EmployeeAccount>[]
+    added: Ref<PersonAccount>[]
+    removed: Ref<PersonAccount>[]
   }
   const client = getClient()
   const hierarchy = client.getHierarchy()
 
   function buildDiff (value: Collaborators, prev: Collaborators | undefined): Diff | undefined {
     if (prev === undefined) return
-    const added: Ref<EmployeeAccount>[] = []
-    const removed: Ref<EmployeeAccount>[] = []
+    const added: Ref<PersonAccount>[] = []
+    const removed: Ref<PersonAccount>[] = []
     const mixin = hierarchy.as(value, notification.mixin.Collaborators)
     const prevMixin = hierarchy.as(prev, notification.mixin.Collaborators)
     const prevSet = new Set(prevMixin?.collaborators ?? [])
     const newSet = new Set(mixin.collaborators)
 
     for (const newCollab of mixin.collaborators) {
-      if (!prevSet.has(newCollab)) added.push(newCollab as Ref<EmployeeAccount>)
+      if (!prevSet.has(newCollab)) added.push(newCollab as Ref<PersonAccount>)
     }
 
     for (const oldCollab of prevMixin?.collaborators ?? []) {
-      if (!newSet.has(oldCollab)) removed.push(oldCollab as Ref<EmployeeAccount>)
+      if (!newSet.has(oldCollab)) removed.push(oldCollab as Ref<PersonAccount>)
     }
 
     return {
@@ -64,7 +64,7 @@
     <div class="antiHSpacer" />
     <IconAdd size={'x-small'} fill={'var(--theme-trans-color)'} />
     {#each diff.added as add}
-      <EmployeeAccountRefPresenter value={add} disabled inline />
+      <PersonAccountRefPresenter value={add} disabled inline />
       <div class="antiHSpacer" />
     {/each}
   {/if}
@@ -72,7 +72,7 @@
     <div class="antiHSpacer" />
     <IconDelete size={'x-small'} fill={'var(--theme-trans-color)'} />
     {#each diff.removed as removed}
-      <EmployeeAccountRefPresenter value={removed} disabled inline />
+      <PersonAccountRefPresenter value={removed} disabled inline />
       <div class="antiHSpacer" />
     {/each}
   {/if}
diff --git a/plugins/recruit-resources/src/components/ApplicationItem.svelte b/plugins/recruit-resources/src/components/ApplicationItem.svelte
index e8963dcb4d..7c7f68c067 100644
--- a/plugins/recruit-resources/src/components/ApplicationItem.svelte
+++ b/plugins/recruit-resources/src/components/ApplicationItem.svelte
@@ -39,6 +39,6 @@
     {#if shortLabel}{shortLabel}-{/if}{value.number}
   </span>
   {#if person}
-    <span class="ml-1">{getName(person)}</span>
+    <span class="ml-1">{getName(client.getHierarchy(), person)}</span>
   {/if}
 </div>
diff --git a/plugins/recruit-resources/src/components/CandidateCard.svelte b/plugins/recruit-resources/src/components/CandidateCard.svelte
index 4e5f85a9aa..a1870dbe00 100644
--- a/plugins/recruit-resources/src/components/CandidateCard.svelte
+++ b/plugins/recruit-resources/src/components/CandidateCard.svelte
@@ -50,7 +50,7 @@
   {#if candidate}
     <DocNavLink object={candidate} {disabled}>
       <div class="name lines-limit-2">
-        {getName(candidate)}
+        {getName(client.getHierarchy(), candidate)}
       </div>
     </DocNavLink>
     {#if client.getHierarchy().hasMixin(candidate, recruit.mixin.Candidate)}
diff --git a/plugins/recruit-resources/src/components/KanbanCard.svelte b/plugins/recruit-resources/src/components/KanbanCard.svelte
index abf29e34e4..f9bce4c101 100644
--- a/plugins/recruit-resources/src/components/KanbanCard.svelte
+++ b/plugins/recruit-resources/src/components/KanbanCard.svelte
@@ -64,7 +64,7 @@
       <Avatar avatar={object.$lookup?.attachedTo?.avatar} size={'medium'} />
       <div class="flex-grow flex-col min-w-0 ml-2">
         <div class="fs-title over-underline lines-limit-2">
-          {object.$lookup?.attachedTo ? getName(object.$lookup.attachedTo) : ''}
+          {object.$lookup?.attachedTo ? getName(client.getHierarchy(), object.$lookup.attachedTo) : ''}
         </div>
         {#if !isTitleHidden && enabledConfig(config, 'title')}
           <div class="text-sm lines-limit-2">{object.$lookup?.attachedTo?.title ?? ''}</div>
@@ -139,7 +139,7 @@
       <AssigneePresenter
         value={object.assignee}
         issueId={object._id}
-        defaultClass={contact.class.Employee}
+        defaultClass={contact.mixin.Employee}
         currentSpace={object.space}
         placeholderLabel={assigneeAttribute.label}
       />
diff --git a/plugins/recruit-resources/src/components/NotificationApplicantPresenter.svelte b/plugins/recruit-resources/src/components/NotificationApplicantPresenter.svelte
index 233164cf27..d6e08d944b 100644
--- a/plugins/recruit-resources/src/components/NotificationApplicantPresenter.svelte
+++ b/plugins/recruit-resources/src/components/NotificationApplicantPresenter.svelte
@@ -43,7 +43,7 @@
       </span>
     </div>
     <span class="overflow-label mt-10px">
-      {candidate ? getName(candidate) : ''}
+      {candidate ? getName(client.getHierarchy(), candidate) : ''}
     </span>
   </div>
 {/if}
diff --git a/plugins/recruit-resources/src/components/review/CreateOpinion.svelte b/plugins/recruit-resources/src/components/review/CreateOpinion.svelte
index 9b69ebe6e3..e729d9f4d2 100644
--- a/plugins/recruit-resources/src/components/review/CreateOpinion.svelte
+++ b/plugins/recruit-resources/src/components/review/CreateOpinion.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import type { Employee } from '@hcengineering/contact'
+  import type { Person } from '@hcengineering/contact'
   import { Account, generateId, Ref } from '@hcengineering/core'
   import { OK, Status } from '@hcengineering/platform'
   import { Card, getClient } from '@hcengineering/presentation'
@@ -26,7 +26,7 @@
 
   export let space: Ref<SpaceWithStates>
   export let review: Ref<Review>
-  export let assignee: Ref<Employee>
+  export let assignee: Ref<Person>
 
   const status: Status = OK
 
diff --git a/plugins/recruit-resources/src/components/review/CreateReview.svelte b/plugins/recruit-resources/src/components/review/CreateReview.svelte
index 8fba7b0231..26c837a41e 100644
--- a/plugins/recruit-resources/src/components/review/CreateReview.svelte
+++ b/plugins/recruit-resources/src/components/review/CreateReview.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import calendar from '@hcengineering/calendar'
-  import type { Contact, EmployeeAccount, Organization, Person } from '@hcengineering/contact'
+  import type { Contact, PersonAccount, Organization, Person } from '@hcengineering/contact'
   import contact from '@hcengineering/contact'
   import { Account, Class, Client, DateRangeMode, Doc, generateId, getCurrentAccount, Ref } from '@hcengineering/core'
   import { getResource, OK, Resource, Severity, Status } from '@hcengineering/platform'
@@ -40,7 +40,7 @@
   const initDate =
     date === undefined ? now : withTime ? date : new Date(date.setHours(now.getHours(), now.getMinutes()))
 
-  const currentUser = getCurrentAccount() as EmployeeAccount
+  const currentUser = getCurrentAccount() as PersonAccount
 
   let status: Status = OK
 
@@ -70,7 +70,7 @@
     company,
     verdict: '',
     title,
-    participants: [currentUser.employee]
+    participants: [currentUser.person]
   }
 
   const dispatch = createEventDispatcher()
diff --git a/plugins/recruit-resources/src/components/review/PersonsPresenter.svelte b/plugins/recruit-resources/src/components/review/PersonsPresenter.svelte
index 3e2e8f6155..44833de439 100644
--- a/plugins/recruit-resources/src/components/review/PersonsPresenter.svelte
+++ b/plugins/recruit-resources/src/components/review/PersonsPresenter.svelte
@@ -20,6 +20,7 @@
   import { Avatar } from '@hcengineering/contact-resources'
   import { showPanel, tooltip } from '@hcengineering/ui'
   import view from '@hcengineering/view'
+  import { getClient } from '@hcengineering/presentation'
 
   export let value: Person | Person[]
   export let inline: boolean = false
@@ -30,6 +31,7 @@
   async function onClick (p: Person) {
     showPanel(view.component.EditDoc, p._id, Hierarchy.mixinOrClass(p), 'content')
   }
+  const client = getClient()
 </script>
 
 {#if value}
@@ -38,7 +40,7 @@
       <div
         class="flex-presenter"
         class:inline-presenter={inline}
-        use:tooltip={{ label: calendar.string.PersonsLabel, props: { name: getName(p) } }}
+        use:tooltip={{ label: calendar.string.PersonsLabel, props: { name: getName(client.getHierarchy(), p) } }}
         on:click={() => onClick(p)}
       >
         <div class="icon">
diff --git a/plugins/recruit-resources/src/utils.ts b/plugins/recruit-resources/src/utils.ts
index 9510ab4f84..37d132874b 100644
--- a/plugins/recruit-resources/src/utils.ts
+++ b/plugins/recruit-resources/src/utils.ts
@@ -176,7 +176,7 @@ export async function getAppTitle (client: Client, ref: Ref<Applicant>): Promise
   if (applicant === undefined) return ''
   const candidate = await client.findOne(contact.class.Contact, { _id: applicant.attachedTo })
   if (candidate === undefined) return ''
-  return getName(candidate)
+  return getName(client.getHierarchy(), candidate)
 }
 
 export async function getRevTitle (client: Client, ref: Ref<Review>): Promise<string> {
diff --git a/plugins/request-resources/src/components/RequestActions.svelte b/plugins/request-resources/src/components/RequestActions.svelte
index e3e9c9603e..ea9cd1c0c2 100644
--- a/plugins/request-resources/src/components/RequestActions.svelte
+++ b/plugins/request-resources/src/components/RequestActions.svelte
@@ -16,7 +16,7 @@
   import { AttachmentRefInput } from '@hcengineering/attachment-resources'
   import chunter, { Comment } from '@hcengineering/chunter'
   import { updateBacklinks } from '@hcengineering/chunter-resources'
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { AttachedData, getCurrentAccount, Ref } from '@hcengineering/core'
   import { getClient } from '@hcengineering/presentation'
   import { Request, RequestStatus } from '@hcengineering/request'
@@ -30,7 +30,7 @@
   export let value: Request
 
   const client = getClient()
-  const me = getCurrentAccount()._id as Ref<EmployeeAccount>
+  const me = getCurrentAccount()._id as Ref<PersonAccount>
 
   const approvable = value.requested.filter((a) => a === me).length > value.approved.filter((a) => a === me).length
 
diff --git a/plugins/request-resources/src/components/RequestDetail.svelte b/plugins/request-resources/src/components/RequestDetail.svelte
index f66b812158..9ba18c8a3e 100644
--- a/plugins/request-resources/src/components/RequestDetail.svelte
+++ b/plugins/request-resources/src/components/RequestDetail.svelte
@@ -13,8 +13,8 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { EmployeeAccount } from '@hcengineering/contact'
-  import { EmployeeAccountRefPresenter } from '@hcengineering/contact-resources'
+  import contact, { PersonAccount } from '@hcengineering/contact'
+  import { PersonAccountRefPresenter } from '@hcengineering/contact-resources'
   import { Account, Ref } from '@hcengineering/core'
   import { createQuery, MessageViewer } from '@hcengineering/presentation'
   import { Request, RequestDecisionComment } from '@hcengineering/request'
@@ -32,7 +32,7 @@
   )
 
   interface RequestDecision {
-    employee: Ref<EmployeeAccount>
+    employee: Ref<PersonAccount>
     decision?: boolean
     comment?: RequestDecisionComment
   }
@@ -65,7 +65,7 @@
   <tbody>
     {#each convert(value, comments) as requested}
       <tr class="antiTable-body__row">
-        <td><EmployeeAccountRefPresenter value={requested.employee} /></td>
+        <td><PersonAccountRefPresenter value={requested.employee} /></td>
         <td><BooleanIcon value={requested.decision} /></td>
         <td
           >{#if requested.comment}
diff --git a/plugins/request-resources/src/components/RequestView.svelte b/plugins/request-resources/src/components/RequestView.svelte
index 5ccf4947e6..69b743e036 100644
--- a/plugins/request-resources/src/components/RequestView.svelte
+++ b/plugins/request-resources/src/components/RequestView.svelte
@@ -13,10 +13,10 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { EmployeeAccount, getName } from '@hcengineering/contact'
+  import contact, { PersonAccount, getName, Employee } from '@hcengineering/contact'
   import { employeeByIdStore } from '@hcengineering/contact-resources'
-  import { Ref } from '@hcengineering/core'
-  import { createQuery } from '@hcengineering/presentation'
+  import { Doc, Ref, TxCUD } from '@hcengineering/core'
+  import { createQuery, getClient } from '@hcengineering/presentation'
   import { Request } from '@hcengineering/request'
   import { Label, TimeSince } from '@hcengineering/ui'
   import { ObjectPresenter } from '@hcengineering/view-resources'
@@ -26,19 +26,21 @@
 
   export let value: Request
 
-  let account: EmployeeAccount | undefined
-  $: employee = account && $employeeByIdStore.get(account.employee)
+  let account: PersonAccount | undefined
+  $: employee = account && $employeeByIdStore.get(account.person as Ref<Employee>)
 
+  const client = getClient()
   const query = createQuery()
 
   $: query.query(
-    contact.class.EmployeeAccount,
-    { _id: value.tx.modifiedBy as Ref<EmployeeAccount> },
+    contact.class.PersonAccount,
+    { _id: value.tx.modifiedBy as Ref<PersonAccount> },
     (res) => {
       ;[account] = res
     },
     { limit: 1 }
   )
+  $: txCud = value.tx as TxCUD<Doc>
 </script>
 
 <div class="container">
@@ -46,14 +48,14 @@
     <div class="label">
       <div class="bold">
         {#if employee}
-          {getName(employee)}
+          {getName(client.getHierarchy(), employee)}
         {/if}
       </div>
       <span class="lower">
         <Label label={request.string.CreatedRequest} />
         <Label label={request.string.For} />
       </span>
-      <ObjectPresenter objectId={value.tx.objectId} _class={value.tx.objectClass} />
+      <ObjectPresenter objectId={txCud.objectId} _class={txCud.objectClass} />
     </div>
     <div class="time"><TimeSince value={value.tx.modifiedOn} /></div>
   </div>
diff --git a/plugins/request-resources/src/components/RequestsPopup.svelte b/plugins/request-resources/src/components/RequestsPopup.svelte
index 351566792b..4aa682bb2d 100644
--- a/plugins/request-resources/src/components/RequestsPopup.svelte
+++ b/plugins/request-resources/src/components/RequestsPopup.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { Class, getCurrentAccount, Ref } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { Request, RequestStatus } from '@hcengineering/request'
@@ -21,7 +21,7 @@
   import request from '../plugin'
 
   let requests: Request[] = []
-  const me = getCurrentAccount()._id as Ref<EmployeeAccount>
+  const me = getCurrentAccount()._id as Ref<PersonAccount>
   const query = createQuery()
   query.query(
     request.class.Request,
diff --git a/plugins/request-resources/src/components/TxView.svelte b/plugins/request-resources/src/components/TxView.svelte
index 4612598b0f..13d1c8126c 100644
--- a/plugins/request-resources/src/components/TxView.svelte
+++ b/plugins/request-resources/src/components/TxView.svelte
@@ -16,8 +16,8 @@
   import { DisplayTx, TxViewlet } from '@hcengineering/activity'
   import { ActivityKey, getValue, newDisplayTx, updateViewlet } from '@hcengineering/activity-resources'
   import activity from '@hcengineering/activity-resources/src/plugin'
-  import { EmployeeAccount } from '@hcengineering/contact'
-  import { employeeAccountByIdStore } from '@hcengineering/contact-resources'
+  import { PersonAccount } from '@hcengineering/contact'
+  import { personAccountByIdStore } from '@hcengineering/contact-resources'
   import core, { AnyAttribute, Doc, Ref, Tx, TxCUD } from '@hcengineering/core'
   import { Asset } from '@hcengineering/platform'
   import { getClient } from '@hcengineering/presentation'
@@ -33,7 +33,7 @@
   let ptx: DisplayTx | undefined
 
   let props: any
-  let employee: EmployeeAccount | undefined
+  let employee: PersonAccount | undefined
   let model: AttributeModel[] = []
   let modelIcon: Asset | undefined = undefined
 
@@ -55,7 +55,7 @@
       }
     })
 
-  $: employee = $employeeAccountByIdStore.get(tx.modifiedBy as Ref<EmployeeAccount>)
+  $: employee = $personAccountByIdStore.get(tx.modifiedBy as Ref<PersonAccount>)
 
   function isMessageType (attr?: AnyAttribute): boolean {
     return attr?.type._class === core.class.TypeMarkup
diff --git a/plugins/request/src/index.ts b/plugins/request/src/index.ts
index f6c888ad01..6d8fb798d3 100644
--- a/plugins/request/src/index.ts
+++ b/plugins/request/src/index.ts
@@ -14,7 +14,7 @@
 //
 
 import { Comment } from '@hcengineering/chunter'
-import { EmployeeAccount } from '@hcengineering/contact'
+import { PersonAccount } from '@hcengineering/contact'
 import type { AttachedDoc, Class, Doc, Mixin, Ref, Tx } from '@hcengineering/core'
 import type { Asset, IntlString, Plugin } from '@hcengineering/platform'
 import { plugin } from '@hcengineering/platform'
@@ -24,10 +24,10 @@ import { AnyComponent } from '@hcengineering/ui'
  * @public
  */
 export interface Request extends AttachedDoc {
-  requested: Ref<EmployeeAccount>[]
-  approved: Ref<EmployeeAccount>[]
+  requested: Ref<PersonAccount>[]
+  approved: Ref<PersonAccount>[]
   requiredApprovesCount: number
-  rejected?: Ref<EmployeeAccount>
+  rejected?: Ref<PersonAccount>
   status: RequestStatus
   tx: Tx
   comments?: number
diff --git a/plugins/setting-resources/src/components/Owners.svelte b/plugins/setting-resources/src/components/Owners.svelte
index d44e716a45..ca7046f90e 100644
--- a/plugins/setting-resources/src/components/Owners.svelte
+++ b/plugins/setting-resources/src/components/Owners.svelte
@@ -13,8 +13,8 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { EmployeeAccount, formatName } from '@hcengineering/contact'
-  import { employeeByIdStore, EmployeePresenter } from '@hcengineering/contact-resources'
+  import contact, { PersonAccount, formatName } from '@hcengineering/contact'
+  import { EmployeePresenter, personByIdStore } from '@hcengineering/contact-resources'
   import { AccountRole, getCurrentAccount, SortingOrder } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { DropdownIntlItem, DropdownLabelsIntl, Icon, Label, EditBox } from '@hcengineering/ui'
@@ -32,11 +32,11 @@
     { id: AccountRole.Owner.toString(), label: setting.string.Owner }
   ]
 
-  let accounts: EmployeeAccount[] = []
+  let accounts: PersonAccount[] = []
   $: owners = accounts.filter((p) => p.role === AccountRole.Owner)
 
   query.query(
-    contact.class.EmployeeAccount,
+    contact.class.PersonAccount,
     {},
     (res) => {
       accounts = res
@@ -46,7 +46,7 @@
     }
   )
 
-  async function change (account: EmployeeAccount, value: AccountRole): Promise<void> {
+  async function change (account: PersonAccount, value: AccountRole): Promise<void> {
     await client.update(account, {
       role: value
     })
@@ -63,7 +63,7 @@
   <div class="ac-body columns">
     <div class="ac-column max">
       {#each accounts as account (account._id)}
-        {@const employee = $employeeByIdStore.get(account.employee)}
+        {@const employee = $personByIdStore.get(account.person)}
         {#if account.name.includes(search)}
           <div class="flex-row-center p-2">
             <div class="p-1 min-w-80">
diff --git a/plugins/setting-resources/src/components/Profile.svelte b/plugins/setting-resources/src/components/Profile.svelte
index 76f3c1f3c2..4720cd8810 100644
--- a/plugins/setting-resources/src/components/Profile.svelte
+++ b/plugins/setting-resources/src/components/Profile.svelte
@@ -13,9 +13,9 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { EmployeeAccount, getFirstName, getLastName } from '@hcengineering/contact'
+  import contact, { Employee, PersonAccount, getFirstName, getLastName } from '@hcengineering/contact'
   import { ChannelsEditor, EditableAvatar, employeeByIdStore } from '@hcengineering/contact-resources'
-  import { getCurrentAccount } from '@hcengineering/core'
+  import { Ref, getCurrentAccount } from '@hcengineering/core'
   import login from '@hcengineering/login'
   import { getResource } from '@hcengineering/platform'
   import { AttributeEditor, getClient, MessageBox } from '@hcengineering/presentation'
@@ -26,15 +26,15 @@
 
   let avatarEditor: EditableAvatar
 
-  const account = getCurrentAccount() as EmployeeAccount
-  const employee = $employeeByIdStore.get(account.employee)
+  const account = getCurrentAccount() as PersonAccount
+  const employee = account !== undefined ? $employeeByIdStore.get(account.person as Ref<Employee>) : undefined
   let firstName = employee ? getFirstName(employee.name) : ''
   let lastName = employee ? getLastName(employee.name) : ''
   let displayName = employee?.displayName ?? ''
 
   onDestroy(
     employeeByIdStore.subscribe((p) => {
-      const emp = p.get(account.employee)
+      const emp = p.get(account.person as Ref<Employee>)
       if (emp) {
         firstName = getFirstName(emp.name)
         lastName = getLastName(emp.name)
@@ -50,7 +50,7 @@
       await avatarEditor.removeAvatar(employee.avatar)
     }
     const avatar = await avatarEditor.createAvatar()
-    await client.updateDoc(employee._class, employee.space, employee._id, {
+    await client.update(employee, {
       avatar
     })
   }
diff --git a/plugins/setting-resources/src/components/Settings.svelte b/plugins/setting-resources/src/components/Settings.svelte
index 58d18574d0..7f8e7d7bdf 100644
--- a/plugins/setting-resources/src/components/Settings.svelte
+++ b/plugins/setting-resources/src/components/Settings.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { AccountRole, getCurrentAccount } from '@hcengineering/core'
   import login, { loginId } from '@hcengineering/login'
   import { setMetadata } from '@hcengineering/platform'
@@ -37,7 +37,7 @@
   let categoryId: string = ''
 
   let categories: SettingsCategory[] = []
-  const account = getCurrentAccount() as EmployeeAccount
+  const account = getCurrentAccount() as PersonAccount
 
   const settingsQuery = createQuery()
   settingsQuery.query(
diff --git a/plugins/setting-resources/src/components/WorkspaceSettings.svelte b/plugins/setting-resources/src/components/WorkspaceSettings.svelte
index 3d7100ba41..79b9c78888 100644
--- a/plugins/setting-resources/src/components/WorkspaceSettings.svelte
+++ b/plugins/setting-resources/src/components/WorkspaceSettings.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { AccountRole, getCurrentAccount } from '@hcengineering/core'
   import { createQuery } from '@hcengineering/presentation'
   import setting, { SettingsCategory } from '@hcengineering/setting'
@@ -25,7 +25,7 @@
   let categoryId: string = ''
 
   let categories: SettingsCategory[] = []
-  const account = getCurrentAccount() as EmployeeAccount
+  const account = getCurrentAccount() as PersonAccount
 
   export let visibileNav = true
 
diff --git a/plugins/setting-resources/src/utils.ts b/plugins/setting-resources/src/utils.ts
index 610d9a68b3..d5af1fc4b6 100644
--- a/plugins/setting-resources/src/utils.ts
+++ b/plugins/setting-resources/src/utils.ts
@@ -1,4 +1,4 @@
-import contact, { EmployeeAccount, getFirstName, getLastName } from '@hcengineering/contact'
+import contact, { Employee, PersonAccount, getFirstName, getLastName } from '@hcengineering/contact'
 import { employeeByIdStore } from '@hcengineering/contact-resources'
 import { Class, Doc, Hierarchy, Ref } from '@hcengineering/core'
 import { getClient } from '@hcengineering/presentation'
@@ -61,11 +61,11 @@ export async function getOwnerFirstName (provider: TemplateDataProvider): Promis
   const value = provider.get(setting.class.Integration)
   if (value === undefined) return
   const client = getClient()
-  const employeeAccount = await client.findOne(contact.class.EmployeeAccount, {
-    _id: value.modifiedBy as Ref<EmployeeAccount>
+  const employeeAccount = await client.findOne(contact.class.PersonAccount, {
+    _id: value.modifiedBy as Ref<PersonAccount>
   })
   if (employeeAccount !== undefined) {
-    const employee = get(employeeByIdStore).get(employeeAccount.employee)
+    const employee = get(employeeByIdStore).get(employeeAccount.person as Ref<Employee>)
     return employee != null ? getFirstName(employee.name) : undefined
   }
 }
@@ -74,11 +74,11 @@ export async function getOwnerLastName (provider: TemplateDataProvider): Promise
   const value = provider.get(setting.class.Integration)
   if (value === undefined) return
   const client = getClient()
-  const employeeAccount = await client.findOne(contact.class.EmployeeAccount, {
-    _id: value.modifiedBy as Ref<EmployeeAccount>
+  const employeeAccount = await client.findOne(contact.class.PersonAccount, {
+    _id: value.modifiedBy as Ref<PersonAccount>
   })
   if (employeeAccount !== undefined) {
-    const employee = get(employeeByIdStore).get(employeeAccount.employee)
+    const employee = get(employeeByIdStore).get(employeeAccount.person as Ref<Employee>)
     return employee != null ? getLastName(employee.name) : undefined
   }
 }
@@ -87,11 +87,14 @@ export async function getOwnerPosition (provider: TemplateDataProvider): Promise
   const value = provider.get(setting.class.Integration)
   if (value === undefined) return
   const client = getClient()
-  const employeeAccount = await client.findOne(contact.class.EmployeeAccount, {
-    _id: value.modifiedBy as Ref<EmployeeAccount>
+  const employeeAccount = await client.findOne(contact.class.PersonAccount, {
+    _id: value.modifiedBy as Ref<PersonAccount>
   })
   if (employeeAccount !== undefined) {
-    const employee = get(employeeByIdStore).get(employeeAccount.employee)
-    return employee != null ? employee.position ?? '' : undefined
+    const employee = get(employeeByIdStore).get(employeeAccount.person as Ref<Employee>)
+    if (employee != null && client.getHierarchy().hasMixin(employee, contact.mixin.Employee)) {
+      return client.getHierarchy().as(employee, contact.mixin.Employee)?.position ?? undefined
+    }
+    return undefined
   }
 }
diff --git a/plugins/task-resources/src/components/AssignedTasks.svelte b/plugins/task-resources/src/components/AssignedTasks.svelte
index d16903bd03..b9b1f6810f 100644
--- a/plugins/task-resources/src/components/AssignedTasks.svelte
+++ b/plugins/task-resources/src/components/AssignedTasks.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
+  import { PersonAccount } from '@hcengineering/contact'
   import { Class, Doc, DocumentQuery, getCurrentAccount, Ref } from '@hcengineering/core'
   import { IntlString } from '@hcengineering/platform'
   import { createQuery, getClient } from '@hcengineering/presentation'
@@ -39,8 +39,8 @@
 
   let search = ''
   const dispatch = createEventDispatcher()
-  const currentUser = getCurrentAccount() as EmployeeAccount
-  const assigned = { assignee: currentUser.employee }
+  const currentUser = getCurrentAccount() as PersonAccount
+  const assigned = { assignee: currentUser.person }
   const created = { createdBy: currentUser._id }
   let subscribed = { _id: { $in: [] as Ref<Task>[] } }
   let mode: string | undefined = undefined
diff --git a/plugins/task-resources/src/components/AssigneePresenter.svelte b/plugins/task-resources/src/components/AssigneePresenter.svelte
index f1387fc24b..98e0003e61 100644
--- a/plugins/task-resources/src/components/AssigneePresenter.svelte
+++ b/plugins/task-resources/src/components/AssigneePresenter.svelte
@@ -85,7 +85,7 @@
     showPopup(
       UsersPopup,
       {
-        _class: contact.class.Employee,
+        _class: contact.mixin.Employee,
         selected: employeeValue?._id,
         docQuery: {
           active: true
@@ -110,7 +110,7 @@
     shouldShowName={shouldShowLabel}
     onEmployeeEdit={handleAssigneeEditorOpened}
     tooltipLabels={{
-      personLabel: employeeValue ? getEmbeddedLabel(getName(employeeValue)) : undefined,
+      personLabel: employeeValue ? getEmbeddedLabel(getName(client.getHierarchy(), employeeValue)) : undefined,
       placeholderLabel: placeholderLabel ?? presenter.label
     }}
   />
diff --git a/plugins/task-resources/src/components/TaskHeader.svelte b/plugins/task-resources/src/components/TaskHeader.svelte
index ede5530de6..701b7e985d 100644
--- a/plugins/task-resources/src/components/TaskHeader.svelte
+++ b/plugins/task-resources/src/components/TaskHeader.svelte
@@ -52,7 +52,7 @@
     if (attrClass === core.class.RefTo) {
       return (attribute.type as RefTo<Doc>).to
     }
-    return contact.class.Employee
+    return contact.mixin.Employee
   }
 
   const taskKeys = ['status', 'assignee', 'doneState']
diff --git a/plugins/task/src/index.ts b/plugins/task/src/index.ts
index 9f8345962f..f64f28aa5c 100644
--- a/plugins/task/src/index.ts
+++ b/plugins/task/src/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import type { Employee } from '@hcengineering/contact'
+import type { Person } from '@hcengineering/contact'
 import {
   AttachedDoc,
   Attribute,
@@ -82,7 +82,7 @@ export interface Task extends AttachedDoc, DocWithRank {
   status: Ref<Status>
   doneState: Ref<DoneState> | null
   number: number
-  assignee: Ref<Employee> | null
+  assignee: Ref<Person> | null
   dueDate: Timestamp | null
   comments?: number
   attachments?: number
@@ -95,7 +95,7 @@ export interface Task extends AttachedDoc, DocWithRank {
  */
 export interface TodoItem extends AttachedDoc, DocWithRank {
   name: Markup
-  assignee: Ref<Employee> | null
+  assignee: Ref<Person> | null
   done: boolean
   dueTo: Timestamp | null
   items?: number
diff --git a/plugins/telegram-resources/src/components/Chat.svelte b/plugins/telegram-resources/src/components/Chat.svelte
index 70c11c53b6..0dcd5b50bf 100644
--- a/plugins/telegram-resources/src/components/Chat.svelte
+++ b/plugins/telegram-resources/src/components/Chat.svelte
@@ -16,14 +16,8 @@
 <script lang="ts">
   import attachment from '@hcengineering/attachment'
   import { AttachmentRefInput } from '@hcengineering/attachment-resources'
-  import contact, {
-    Channel,
-    Contact,
-    Employee,
-    EmployeeAccount,
-    getName as getContactName
-  } from '@hcengineering/contact'
-  import { Avatar, employeeAccountByIdStore, employeeByIdStore } from '@hcengineering/contact-resources'
+  import contact, { Channel, Contact, Person, PersonAccount, getName as getContactName } from '@hcengineering/contact'
+  import { Avatar, personAccountByIdStore, personByIdStore } from '@hcengineering/contact-resources'
   import { IdMap, Ref, SortingOrder, generateId, getCurrentAccount } from '@hcengineering/core'
   import { NotificationClientImpl } from '@hcengineering/notification-resources'
   import { getEmbeddedLabel, getResource } from '@hcengineering/platform'
@@ -138,8 +132,8 @@
     loading = false
   }
 
-  function getName (message: TelegramMessage, accounts: IdMap<EmployeeAccount>): string {
-    return message.incoming ? object.name : accounts.get(message.modifiedBy as Ref<EmployeeAccount>)?.name ?? ''
+  function getName (message: TelegramMessage, accounts: IdMap<PersonAccount>): string {
+    return message.incoming ? object.name : accounts.get(message.modifiedBy as Ref<PersonAccount>)?.name ?? ''
   }
 
   async function share (): Promise<void> {
@@ -151,7 +145,7 @@
       object._class,
       'sharedTelegramMessages',
       {
-        messages: convertMessages(selectedMessages, $employeeAccountByIdStore)
+        messages: convertMessages(selectedMessages, $personAccountByIdStore)
       }
     )
     if (channel !== undefined) {
@@ -166,7 +160,7 @@
     selected = selected
   }
 
-  function convertMessages (messages: TelegramMessage[], accounts: IdMap<EmployeeAccount>): SharedTelegramMessage[] {
+  function convertMessages (messages: TelegramMessage[], accounts: IdMap<PersonAccount>): SharedTelegramMessage[] {
     return messages.map((m) => {
       return {
         ...m,
@@ -197,18 +191,18 @@
 
   function getParticipants (
     messages: TelegramMessage[],
-    accounts: IdMap<EmployeeAccount>,
+    accounts: IdMap<PersonAccount>,
     object: Contact | undefined,
-    employees: IdMap<Employee>
+    employees: IdMap<Person>
   ): Contact[] {
     if (object === undefined || accounts.size === 0) return []
     const res: IdMap<Contact> = new Map()
     res.set(object._id, object)
     const accs = new Set(messages.map((p) => p.modifiedBy))
     for (const acc of accs) {
-      const account = accounts.get(acc as Ref<EmployeeAccount>)
+      const account = accounts.get(acc as Ref<PersonAccount>)
       if (account !== undefined) {
-        const emp = employees.get(account.employee)
+        const emp = employees.get(account.person)
         if (emp !== undefined) {
           res.set(emp._id, emp)
         }
@@ -217,7 +211,7 @@
     return Array.from(res.values())
   }
 
-  $: participants = getParticipants(messages, $employeeAccountByIdStore, object, $employeeByIdStore)
+  $: participants = getParticipants(messages, $personAccountByIdStore, object, $personByIdStore)
 </script>
 
 {#if object !== undefined}
@@ -277,7 +271,7 @@
 
     <Scroller bottomStart autoscroll>
       {#if messages}
-        <Messages messages={convertMessages(messages, $employeeAccountByIdStore)} {selectable} bind:selected />
+        <Messages messages={convertMessages(messages, $personAccountByIdStore)} {selectable} bind:selected />
       {/if}
     </Scroller>
 
diff --git a/plugins/telegram-resources/src/utils.ts b/plugins/telegram-resources/src/utils.ts
index 6053b6c532..6941922981 100644
--- a/plugins/telegram-resources/src/utils.ts
+++ b/plugins/telegram-resources/src/utils.ts
@@ -13,18 +13,18 @@
 // limitations under the License.
 //
 
+import contact, { Employee, PersonAccount } from '@hcengineering/contact'
 import { employeeByIdStore, getContactChannel } from '@hcengineering/contact-resources'
 import { Ref, getCurrentAccount } from '@hcengineering/core'
 import { getClient } from '@hcengineering/presentation'
-import contact, { EmployeeAccount } from '@hcengineering/contact'
+import setting from '@hcengineering/setting'
 import { TemplateDataProvider } from '@hcengineering/templates'
 import { get } from 'svelte/store'
-import setting from '@hcengineering/setting'
 
 export async function getCurrentEmployeeTG (): Promise<string | undefined> {
-  const me = getCurrentAccount() as EmployeeAccount
+  const me = getCurrentAccount() as PersonAccount
   const client = getClient()
-  const employee = await client.findOne(contact.class.Employee, { _id: me.employee })
+  const employee = await client.findOne(contact.mixin.Employee, { _id: me.person as unknown as Ref<Employee> })
   if (employee !== undefined) {
     return await getContactChannel(employee, contact.channelProvider.Telegram)
   }
@@ -34,11 +34,11 @@ export async function getIntegrationOwnerTG (provider: TemplateDataProvider): Pr
   const value = provider.get(setting.class.Integration)
   if (value === undefined) return
   const client = getClient()
-  const employeeAccount = await client.findOne(contact.class.EmployeeAccount, {
-    _id: value.modifiedBy as Ref<EmployeeAccount>
+  const employeeAccount = await client.findOne(contact.class.PersonAccount, {
+    _id: value.modifiedBy as Ref<PersonAccount>
   })
   if (employeeAccount !== undefined) {
-    const employee = get(employeeByIdStore).get(employeeAccount.employee)
+    const employee = get(employeeByIdStore).get(employeeAccount.person as Ref<Employee>)
     if (employee !== undefined) {
       return await getContactChannel(employee, contact.channelProvider.Telegram)
     }
diff --git a/plugins/tracker-resources/src/components/AccountPopup.svelte b/plugins/tracker-resources/src/components/AccountPopup.svelte
index 6631dc8005..7a565d3630 100644
--- a/plugins/tracker-resources/src/components/AccountPopup.svelte
+++ b/plugins/tracker-resources/src/components/AccountPopup.svelte
@@ -13,9 +13,9 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount, formatName } from '@hcengineering/contact'
+  import { Employee, PersonAccount, formatName } from '@hcengineering/contact'
   import { Avatar, employeeByIdStore } from '@hcengineering/contact-resources'
-  import { getCurrentAccount } from '@hcengineering/core'
+  import { Ref, getCurrentAccount } from '@hcengineering/core'
   import login, { loginId } from '@hcengineering/login'
   import { setMetadata } from '@hcengineering/platform'
   import presentation, { closeClient } from '@hcengineering/presentation'
@@ -35,8 +35,8 @@
     return []
   }
 
-  const account = getCurrentAccount() as EmployeeAccount
-  $: employee = $employeeByIdStore.get(account.employee)
+  const account = getCurrentAccount() as PersonAccount
+  $: employee = $employeeByIdStore.get(account.person as Ref<Employee>)
 
   function selectCategory (sp: SettingsCategory): void {
     closePopup()
diff --git a/plugins/tracker-resources/src/components/components/LeadPresenter.svelte b/plugins/tracker-resources/src/components/components/LeadPresenter.svelte
index 30385d32fc..54ba1d5b17 100644
--- a/plugins/tracker-resources/src/components/components/LeadPresenter.svelte
+++ b/plugins/tracker-resources/src/components/components/LeadPresenter.svelte
@@ -65,7 +65,7 @@
     showPopup(
       UsersPopup,
       {
-        _class: contact.class.Employee,
+        _class: contact.mixin.Employee,
         selected: value?._id,
         docQuery: {
           active: true
diff --git a/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte b/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte
index ceb200ece2..25c45133af 100644
--- a/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte
+++ b/plugins/tracker-resources/src/components/issues/AssigneeEditor.svelte
@@ -13,15 +13,15 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Employee, EmployeeAccount } from '@hcengineering/contact'
-  import { AssigneeBox, employeeAccountByIdStore } from '@hcengineering/contact-resources'
+  import { Employee, PersonAccount, Person } from '@hcengineering/contact'
+  import { AssigneeBox, personAccountByIdStore } from '@hcengineering/contact-resources'
   import { Doc, DocumentQuery, Ref } from '@hcengineering/core'
   import { createQuery, getClient } from '@hcengineering/presentation'
   import { Issue, Project } from '@hcengineering/tracker'
   import { ButtonKind, ButtonSize, IconSize, TooltipAlignment } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
-  import { getPreviousAssignees } from '../../utils'
   import tracker from '../../plugin'
+  import { getPreviousAssignees } from '../../utils'
 
   type Object = (Doc | {}) & Pick<Issue, 'space' | 'component' | 'assignee'>
 
@@ -40,10 +40,10 @@
   const projectQuery = createQuery()
 
   let project: Project | undefined
-  let prevAssigned: Ref<Employee>[] = []
+  let prevAssigned: Ref<Person>[] = []
   let componentLead: Ref<Employee> | undefined = undefined
   let members: Ref<Employee>[] = []
-  let docQuery: DocumentQuery<Employee> = { active: true }
+  let docQuery: DocumentQuery<Employee> = {}
 
   $: '_class' in object &&
     getPreviousAssignees(object._id).then((res) => {
@@ -59,17 +59,17 @@
     }
     if (project !== undefined) {
       const accounts = project.members
-        .map((p) => $employeeAccountByIdStore.get(p as Ref<EmployeeAccount>))
-        .filter((p) => p !== undefined) as EmployeeAccount[]
-      members = accounts.map((p) => p.employee)
+        .map((p) => $personAccountByIdStore.get(p as Ref<PersonAccount>))
+        .filter((p) => p !== undefined) as PersonAccount[]
+      members = accounts.map((p) => p.person as Ref<Employee>)
     } else {
       members = []
     }
 
-    docQuery = project?.private ? { _id: { $in: members }, active: true } : { active: true }
+    docQuery = project?.private ? { _id: { $in: members } } : { active: true }
   }
 
-  const handleAssigneeChanged = async (newAssignee: Ref<Employee> | undefined) => {
+  const handleAssigneeChanged = async (newAssignee: Ref<Person> | undefined) => {
     if (newAssignee === undefined || object.assignee === newAssignee) {
       return
     }
@@ -83,7 +83,7 @@
 
   $: projectQuery.query(tracker.class.Project, { _id: object.space }, (res) => ([project] = res))
   $: project && updateComponentMembers(project, object)
-  $: docQuery = project?.private ? { _id: { $in: members }, active: true } : { active: true }
+  $: docQuery = project?.private ? { _id: { $in: members } } : {}
 </script>
 
 {#if object}
diff --git a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
index ddb47b0aae..46350b0995 100644
--- a/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
+++ b/plugins/tracker-resources/src/components/issues/edit/ControlPanel.svelte
@@ -13,8 +13,8 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { EmployeeAccount } from '@hcengineering/contact'
-  import { EmployeeBox, employeeAccountByIdStore, employeeByIdStore } from '@hcengineering/contact-resources'
+  import { PersonAccount } from '@hcengineering/contact'
+  import { EmployeeBox, personAccountByIdStore, personByIdStore } from '@hcengineering/contact-resources'
   import core, { ClassifierKind, Doc, Mixin, Ref } from '@hcengineering/core'
   import { AttributeBarEditor, KeyedAttribute, createQuery, getClient } from '@hcengineering/presentation'
 
@@ -87,10 +87,10 @@
     'blockedBy'
   ])
 
-  let account: EmployeeAccount | undefined
-  $: employee = account && $employeeByIdStore.get(account.employee)
+  let account: PersonAccount | undefined
 
-  $: account = $employeeAccountByIdStore.get(issue.createdBy as Ref<EmployeeAccount>)
+  $: account = $personAccountByIdStore.get(issue.createdBy as Ref<PersonAccount>)
+  $: employee = account && $personByIdStore.get(account.person)
 </script>
 
 <div class="popupPanel-body__aside-grid">
diff --git a/plugins/tracker-resources/src/components/issues/timereport/EstimationSubIssueList.svelte b/plugins/tracker-resources/src/components/issues/timereport/EstimationSubIssueList.svelte
index c96298cf5b..390a48cbd8 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/EstimationSubIssueList.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/EstimationSubIssueList.svelte
@@ -66,7 +66,7 @@
             width={'100%'}
             kind={'ghost'}
             label={tracker.string.Assignee}
-            _class={contact.class.Employee}
+            _class={contact.mixin.Employee}
             value={issue.assignee}
             readonly
             showNavigate={false}
diff --git a/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte b/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte
index 240d62c7d3..f15a152ea3 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/ReportsPopup.svelte
@@ -34,7 +34,7 @@
   const options: FindOptions<TimeSpendReport> = {
     lookup: {
       attachedTo: tracker.class.Issue,
-      employee: contact.class.Employee
+      employee: contact.mixin.Employee
     }
   }
   function addReport (event: MouseEvent): void {
diff --git a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
index 2211442d39..4f3aa6ee24 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportPopup.svelte
@@ -29,7 +29,7 @@
   export let issueId: Ref<Issue> | undefined = issue?._id
   export let issueClass: Ref<Class<Issue>> = issue?._class ?? tracker.class.Issue
   export let space: Ref<Space> | undefined = issue?.space
-  export let assignee: Ref<Employee> | null | undefined = issue?.assignee
+  export let assignee: Ref<Employee> | null | undefined = issue?.assignee as Ref<Employee>
 
   export let value: TimeSpendReport | undefined
   export let placeholder: IntlString = tracker.string.TimeSpendReportValue
@@ -131,7 +131,7 @@
   <EditBox bind:value={data.description} placeholder={tracker.string.TimeSpendReportDescription} kind={'editbox'} />
   <svelte:fragment slot="pool">
     <UserBox
-      _class={contact.class.Employee}
+      _class={contact.mixin.Employee}
       label={contact.string.Employee}
       kind={'regular'}
       size={'large'}
diff --git a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportsList.svelte b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportsList.svelte
index 4434f92dd5..b29c97dc90 100644
--- a/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportsList.svelte
+++ b/plugins/tracker-resources/src/components/issues/timereport/TimeSpendReportsList.svelte
@@ -98,7 +98,7 @@
             width={'100%'}
             kind={'ghost'}
             label={tracker.string.Assignee}
-            _class={contact.class.Employee}
+            _class={contact.mixin.Employee}
             value={report.employee}
             readonly
             showNavigate={false}
diff --git a/plugins/tracker-resources/src/components/myissues/MyIssues.svelte b/plugins/tracker-resources/src/components/myissues/MyIssues.svelte
index c6f7ef12e5..229e01cf04 100644
--- a/plugins/tracker-resources/src/components/myissues/MyIssues.svelte
+++ b/plugins/tracker-resources/src/components/myissues/MyIssues.svelte
@@ -14,7 +14,7 @@
 -->
 <script lang="ts">
   import { createEventDispatcher } from 'svelte'
-  import type { EmployeeAccount } from '@hcengineering/contact'
+  import type { PersonAccount } from '@hcengineering/contact'
   import { Doc, DocumentQuery, getCurrentAccount, Ref } from '@hcengineering/core'
   import type { IntlString } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
@@ -28,8 +28,8 @@
   export let config: [string, IntlString, object][] = []
 
   const dispatch = createEventDispatcher()
-  const currentUser = getCurrentAccount() as EmployeeAccount
-  const assigned = { assignee: currentUser.employee }
+  const currentUser = getCurrentAccount() as PersonAccount
+  const assigned = { assignee: currentUser.person }
   const created = { createdBy: currentUser._id }
   let subscribed = { _id: { $in: [] as Ref<Issue>[] } }
   let query: DocumentQuery<Issue> | undefined = undefined
diff --git a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
index 1c31ac40cb..a0ac5e6bb0 100644
--- a/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
+++ b/plugins/tracker-resources/src/components/templates/CreateIssueTemplate.svelte
@@ -13,12 +13,12 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import { Employee } from '@hcengineering/contact'
-  import { Data, Doc, generateId, Ref } from '@hcengineering/core'
-  import { Card, getClient, KeyedAttribute, SpaceSelector } from '@hcengineering/presentation'
+  import { Person } from '@hcengineering/contact'
+  import { Data, Doc, Ref, generateId } from '@hcengineering/core'
+  import { Card, KeyedAttribute, SpaceSelector, getClient } from '@hcengineering/presentation'
   import tags, { TagElement } from '@hcengineering/tags'
   import { StyledTextBox } from '@hcengineering/text-editor'
-  import { Component as ComponentType, IssuePriority, IssueTemplate, Project, Milestone } from '@hcengineering/tracker'
+  import { Component as ComponentType, IssuePriority, IssueTemplate, Milestone, Project } from '@hcengineering/tracker'
   import { Component, EditBox, Label } from '@hcengineering/ui'
   import { createEventDispatcher } from 'svelte'
   import { activeComponent, activeMilestone } from '../../issues'
@@ -27,13 +27,13 @@
   import AssigneeEditor from '../issues/AssigneeEditor.svelte'
   import PriorityEditor from '../issues/PriorityEditor.svelte'
   import MilestoneSelector from '../milestones/MilestoneSelector.svelte'
+  import ProjectPresenter from '../projects/ProjectPresenter.svelte'
   import EstimationEditor from './EstimationEditor.svelte'
   import SubIssueTemplates from './IssueTemplateChilds.svelte'
-  import ProjectPresenter from '../projects/ProjectPresenter.svelte'
 
   export let space: Ref<Project>
   export let priority: IssuePriority = IssuePriority.NoPriority
-  export let assignee: Ref<Employee> | null = null
+  export let assignee: Ref<Person> | null = null
   export let component: Ref<ComponentType> | null = $activeComponent ?? null
   export let milestone: Ref<Milestone> | null = $activeMilestone ?? null
   export let relatedTo: Doc | undefined
diff --git a/plugins/tracker/src/index.ts b/plugins/tracker/src/index.ts
index 7878c738a2..c57b9f7d61 100644
--- a/plugins/tracker/src/index.ts
+++ b/plugins/tracker/src/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import { Employee } from '@hcengineering/contact'
+import { Employee, Person } from '@hcengineering/contact'
 import {
   AttachedDoc,
   Attribute,
@@ -179,7 +179,7 @@ export interface IssueDraft {
   description: Markup
   status?: Ref<IssueStatus>
   priority: IssuePriority
-  assignee: Ref<Employee> | null
+  assignee: Ref<Person> | null
   component: Ref<Component> | null
   space: Ref<Project>
   dueDate: Timestamp | null
@@ -207,7 +207,7 @@ export interface IssueTemplateData {
   description: Markup
   priority: IssuePriority
 
-  assignee: Ref<Employee> | null
+  assignee: Ref<Person> | null
   component: Ref<Component> | null
 
   milestone?: Ref<Milestone> | null
diff --git a/plugins/view-resources/src/actions.ts b/plugins/view-resources/src/actions.ts
index 6c87455cd5..17225e651e 100644
--- a/plugins/view-resources/src/actions.ts
+++ b/plugins/view-resources/src/actions.ts
@@ -151,6 +151,14 @@ export function filterActions (
       ignore.push(...ignoreActions.actions)
     }
   }
+  for (const cl of hierarchy.getDescendants(clazz._id)) {
+    if (hierarchy.isMixin(cl) && hierarchy.hasMixin(doc, cl)) {
+      const ignoreActions = hierarchy.as(hierarchy.getClassOrInterface(cl), view.mixin.IgnoreActions)
+      if (ignoreActions?.actions !== undefined) {
+        ignore.push(...ignoreActions.actions)
+      }
+    }
+  }
   const overrideRemove: Array<Ref<Action>> = []
   for (const action of actions) {
     if (ignore.includes(action._id)) {
@@ -167,9 +175,16 @@ export function filterActions (
         overrideRemove.push(...action.override)
       }
       if (action.query !== undefined) {
-        const r = matchQuery([doc], action.query, doc._class, hierarchy)
-        if (r.length === 0) {
-          continue
+        if (hierarchy.isMixin(action.target)) {
+          const r = matchQuery([hierarchy.as(doc, action.target)], action.query, action.target, hierarchy)
+          if (r.length === 0) {
+            continue
+          }
+        } else {
+          const r = matchQuery([doc], action.query, doc._class, hierarchy)
+          if (r.length === 0) {
+            continue
+          }
         }
       }
       result.push(action)
diff --git a/plugins/view-resources/src/components/EditDoc.svelte b/plugins/view-resources/src/components/EditDoc.svelte
index 61dc47c273..dcaad31e4d 100644
--- a/plugins/view-resources/src/components/EditDoc.svelte
+++ b/plugins/view-resources/src/components/EditDoc.svelte
@@ -225,7 +225,7 @@
     const name = (object as any).name
     if (name !== undefined) {
       if (hierarchy.isDerived(object._class, contact.class.Person)) {
-        return getName(object as Contact)
+        return getName(client.getHierarchy(), object as Contact)
       }
       return name
     }
diff --git a/plugins/view-resources/src/components/ViewOptionsButton.svelte b/plugins/view-resources/src/components/ViewOptionsButton.svelte
index 445ae1fdc3..42a1d63ee3 100644
--- a/plugins/view-resources/src/components/ViewOptionsButton.svelte
+++ b/plugins/view-resources/src/components/ViewOptionsButton.svelte
@@ -35,8 +35,9 @@
     if (viewlet === undefined) {
       return
     }
+    const h = client.getHierarchy()
     const config = await client.findAll(view.class.Viewlet, {
-      attachTo: { $in: client.getHierarchy().getDescendants(viewlet.attachTo) },
+      attachTo: { $in: h.getDescendants(viewlet.attachTo) },
       variant: viewlet.variant ? viewlet.variant : { $exists: false },
       descriptor: viewlet.descriptor
     })
diff --git a/plugins/view-resources/src/components/ViewletSetting.svelte b/plugins/view-resources/src/components/ViewletSetting.svelte
index 75d4fbae30..50a7bbc3e6 100644
--- a/plugins/view-resources/src/components/ViewletSetting.svelte
+++ b/plugins/view-resources/src/components/ViewletSetting.svelte
@@ -36,7 +36,12 @@
 
   $: client
     .findAll(view.class.Viewlet, {
-      attachTo: { $in: client.getHierarchy().getDescendants(viewlet.attachTo) },
+      attachTo: {
+        $in: client
+          .getHierarchy()
+          .getDescendants(viewlet.attachTo)
+          .filter((it) => !client.getHierarchy().isMixin(it) || it === viewlet.attachTo)
+      },
       variant: viewlet.variant ? viewlet.variant : { $exists: false },
       descriptor: viewlet.descriptor
     })
diff --git a/plugins/workbench-resources/src/components/AccountPopup.svelte b/plugins/workbench-resources/src/components/AccountPopup.svelte
index 8fa2ce9468..0993fd0fed 100644
--- a/plugins/workbench-resources/src/components/AccountPopup.svelte
+++ b/plugins/workbench-resources/src/components/AccountPopup.svelte
@@ -13,8 +13,8 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { Employee, EmployeeAccount, formatName } from '@hcengineering/contact'
-  import { AccountRole, getCurrentAccount } from '@hcengineering/core'
+  import contact, { Employee, PersonAccount, formatName } from '@hcengineering/contact'
+  import { AccountRole, getCurrentAccount, Ref } from '@hcengineering/core'
   import login, { loginId } from '@hcengineering/login'
   import { setMetadata } from '@hcengineering/platform'
   import presentation, { closeClient, createQuery } from '@hcengineering/presentation'
@@ -50,14 +50,14 @@
     { sort: { order: 1 } }
   )
 
-  const account = getCurrentAccount() as EmployeeAccount
+  const account = getCurrentAccount() as PersonAccount
   let employee: Employee | undefined
   const employeeQ = createQuery()
 
   employeeQ.query(
-    contact.class.Employee,
+    contact.mixin.Employee,
     {
-      _id: account.employee
+      _id: account.person as Ref<Employee>
     },
     (res) => {
       employee = res[0]
diff --git a/plugins/workbench-resources/src/components/ServerManager.svelte b/plugins/workbench-resources/src/components/ServerManager.svelte
index 7fa60905fb..9c11becb42 100644
--- a/plugins/workbench-resources/src/components/ServerManager.svelte
+++ b/plugins/workbench-resources/src/components/ServerManager.svelte
@@ -1,5 +1,5 @@
 <script lang="ts">
-  import contact, { EmployeeAccount } from '@hcengineering/contact'
+  import contact, { PersonAccount } from '@hcengineering/contact'
   import { metricsToRows } from '@hcengineering/core'
   import { getEmbeddedLabel } from '@hcengineering/platform'
   import { createQuery } from '@hcengineering/presentation'
@@ -55,10 +55,10 @@
 
   const employeeQuery = createQuery()
 
-  let employees: Map<string, EmployeeAccount> = new Map()
+  let employees: Map<string, PersonAccount> = new Map()
 
-  employeeQuery.query(contact.class.EmployeeAccount, {}, (res) => {
-    const emp: Map<string, EmployeeAccount> = new Map()
+  employeeQuery.query(contact.class.PersonAccount, {}, (res) => {
+    const emp: Map<string, PersonAccount> = new Map()
     for (const r of res) {
       emp.set(r.email, r)
     }
@@ -136,8 +136,8 @@
                 <div class="p-1 flex-row-center">
                   {#if employee}
                     <ObjectPresenter
-                      _class={contact.class.Employee}
-                      objectId={employee.employee}
+                      _class={contact.mixin.Employee}
+                      objectId={employee.person}
                       props={{ shouldShowAvatar: true }}
                     />
                   {:else}
diff --git a/plugins/workbench-resources/src/components/Workbench.svelte b/plugins/workbench-resources/src/components/Workbench.svelte
index f5ecaac480..ee8481b20a 100644
--- a/plugins/workbench-resources/src/components/Workbench.svelte
+++ b/plugins/workbench-resources/src/components/Workbench.svelte
@@ -13,7 +13,7 @@
 // limitations under the License.
 -->
 <script lang="ts">
-  import contact, { Employee, EmployeeAccount } from '@hcengineering/contact'
+  import contact, { Employee, PersonAccount } from '@hcengineering/contact'
   import core, { Class, Doc, Ref, Space, getCurrentAccount, setCurrentAccount } from '@hcengineering/core'
   import login from '@hcengineering/login'
   import notification, { notificationId } from '@hcengineering/notification'
@@ -127,12 +127,12 @@
     })
   })
 
-  const accountId = (getCurrentAccount() as EmployeeAccount)._id
+  const accountId = (getCurrentAccount() as PersonAccount)._id
 
-  let account: EmployeeAccount | undefined
+  let account: PersonAccount | undefined
   const accountQ = createQuery()
   accountQ.query(
-    contact.class.EmployeeAccount,
+    contact.class.PersonAccount,
     {
       _id: accountId
     },
@@ -149,9 +149,9 @@
   const employeeQ = createQuery()
 
   $: employeeQ.query(
-    contact.class.Employee,
+    contact.mixin.Employee,
     {
-      _id: account?.employee
+      _id: account?.person as Ref<Employee>
     },
     (res) => {
       employee = res[0]
diff --git a/server-plugins/calendar-resources/src/index.ts b/server-plugins/calendar-resources/src/index.ts
index 6fb0f5d211..41cd350796 100644
--- a/server-plugins/calendar-resources/src/index.ts
+++ b/server-plugins/calendar-resources/src/index.ts
@@ -32,7 +32,7 @@ import core, {
 import { getResource } from '@hcengineering/platform'
 import { TriggerControl } from '@hcengineering/server-core'
 import { getHTMLPresenter, getTextPresenter } from '@hcengineering/server-notification-resources'
-import contact, { EmployeeAccount } from '@hcengineering/contact'
+import contact, { PersonAccount } from '@hcengineering/contact'
 
 /**
  * @public
@@ -82,8 +82,8 @@ export async function ReminderTextPresenter (doc: Doc, control: TriggerControl):
 /**
  * @public
  */
-export async function OnEmployeeAccountCreate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
-  const ctx = TxProcessor.extractTx(tx) as TxCreateDoc<EmployeeAccount>
+export async function OnPersonAccountCreate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
+  const ctx = TxProcessor.extractTx(tx) as TxCreateDoc<PersonAccount>
   const user = TxProcessor.createDoc2Doc(ctx)
 
   const res: TxCreateDoc<Calendar> = control.txFactory.createTxCreateDoc(
@@ -108,9 +108,9 @@ async function onEventCreate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
   const ev = TxProcessor.createDoc2Doc(ctx)
 
   const res: Tx[] = []
-  const accounts = await control.modelDb.findAll(contact.class.EmployeeAccount, {})
+  const accounts = await control.modelDb.findAll(contact.class.PersonAccount, {})
   const participants = accounts.filter(
-    (p) => (p._id !== ev.createdBy ?? ev.modifiedBy) && ev.participants.includes(p.employee)
+    (p) => (p._id !== ev.createdBy ?? ev.modifiedBy) && ev.participants.includes(p.person)
   )
   for (const acc of participants) {
     const innerTx = control.txFactory.createTxCreateDoc(ev._class, `${acc._id}_calendar` as Ref<Calendar>, {
@@ -227,6 +227,6 @@ export default async () => ({
   },
   trigger: {
     OnEvent,
-    OnEmployeeAccountCreate
+    OnPersonAccountCreate
   }
 })
diff --git a/server-plugins/calendar/src/index.ts b/server-plugins/calendar/src/index.ts
index d1c8bfde39..4de699ac4b 100644
--- a/server-plugins/calendar/src/index.ts
+++ b/server-plugins/calendar/src/index.ts
@@ -46,6 +46,6 @@ export default plugin(serverCalendarId, {
   },
   trigger: {
     OnEvent: '' as Resource<TriggerFunc>,
-    OnEmployeeAccountCreate: '' as Resource<TriggerFunc>
+    OnPersonAccountCreate: '' as Resource<TriggerFunc>
   }
 })
diff --git a/server-plugins/chunter-resources/src/index.ts b/server-plugins/chunter-resources/src/index.ts
index d27e8f7c25..fb8a598a5b 100644
--- a/server-plugins/chunter-resources/src/index.ts
+++ b/server-plugins/chunter-resources/src/index.ts
@@ -14,7 +14,7 @@
 //
 
 import chunter, { Backlink, chunterId, ChunterSpace, Comment, Message, ThreadMessage } from '@hcengineering/chunter'
-import contact, { Employee, EmployeeAccount } from '@hcengineering/contact'
+import contact, { Employee, PersonAccount } from '@hcengineering/contact'
 import core, {
   Account,
   Class,
@@ -105,13 +105,13 @@ async function ThreadMessageCreate (tx: Tx, control: TriggerControl): Promise<Tx
       lastReply: tx.modifiedOn
     }
   )
-  const employee = control.modelDb.getObject(tx.modifiedBy) as EmployeeAccount
+  const employee = control.modelDb.getObject(tx.modifiedBy) as PersonAccount
   const employeeTx = control.txFactory.createTxUpdateDoc<Message>(
     chunter.class.Message,
     comment.space,
     comment.attachedTo as Ref<Message>,
     {
-      $push: { replies: employee.employee }
+      $push: { replies: employee.person }
     }
   )
   const result: TxUpdateDoc<Message>[] = []
@@ -184,7 +184,7 @@ async function ThreadMessageDelete (tx: Tx, control: TriggerControl): Promise<Tx
     comment.space,
     comment.attachedTo,
     {
-      replies: comments.map((comm) => (control.modelDb.getObject(comm.createBy) as EmployeeAccount).employee),
+      replies: comments.map((comm) => (control.modelDb.getObject(comm.createBy) as PersonAccount).person),
       lastReply:
         comments.length > 0 ? Math.max(...comments.map((comm) => comm.createdOn ?? comm.modifiedOn)) : undefined
     }
@@ -228,7 +228,7 @@ function isBacklink (ptx: TxCollectionCUD<Doc, Backlink>, hierarchy: Hierarchy):
   if (
     ptx.tx._class !== core.class.TxCreateDoc ||
     !hierarchy.isDerived(ptx.tx.objectClass, chunter.class.Backlink) ||
-    !hierarchy.isDerived(ptx.objectClass, contact.class.Employee)
+    !hierarchy.isDerived(ptx.objectClass, contact.mixin.Employee)
   ) {
     return false
   }
@@ -248,9 +248,9 @@ export async function IsMeMentioned (
   const ptx = tx as TxCollectionCUD<Doc, Backlink>
   if (!isBacklink(ptx, control.hierarchy)) return false
   const backlink = TxProcessor.createDoc2Doc(ptx.tx as TxCreateDoc<Backlink>)
-  if (!control.hierarchy.isDerived(backlink.backlinkClass, contact.class.Employee)) return false
+  if (!control.hierarchy.isDerived(backlink.backlinkClass, contact.mixin.Employee)) return false
   const acc = (
-    await control.modelDb.findAll(contact.class.EmployeeAccount, { employee: backlink.backlinkId as Ref<Employee> })
+    await control.modelDb.findAll(contact.class.PersonAccount, { person: backlink.backlinkId as Ref<Employee> })
   )[0]
   return acc._id === user
 }
diff --git a/server-plugins/contact-resources/src/index.ts b/server-plugins/contact-resources/src/index.ts
index 623257cfd4..d3a93ea106 100644
--- a/server-plugins/contact-resources/src/index.ts
+++ b/server-plugins/contact-resources/src/index.ts
@@ -14,31 +14,8 @@
 // limitations under the License.
 //
 
-import contact, {
-  Channel,
-  Contact,
-  contactId,
-  Employee,
-  EmployeeAccount,
-  getName,
-  Organization,
-  Person
-} from '@hcengineering/contact'
-import core, {
-  Account,
-  AttachedDoc,
-  Collection,
-  concatLink,
-  Doc,
-  Ref,
-  RefTo,
-  Timestamp,
-  Tx,
-  TxBuilder,
-  TxRemoveDoc,
-  TxUpdateDoc,
-  updateAttribute
-} from '@hcengineering/core'
+import contact, { Channel, Contact, Organization, Person, contactId, getName } from '@hcengineering/contact'
+import { Doc, Tx, TxRemoveDoc, TxUpdateDoc, concatLink } from '@hcengineering/core'
 import notification, { Collaborators } from '@hcengineering/notification'
 import { getMetadata } from '@hcengineering/platform'
 import serverCore, { TriggerControl } from '@hcengineering/server-core'
@@ -103,215 +80,6 @@ export async function OnContactDelete (
   return result
 }
 
-async function updateAllRefs (
-  control: TriggerControl,
-  sourceAccount: EmployeeAccount,
-  targetAccount: EmployeeAccount,
-  modifiedOn: Timestamp,
-  modifiedBy: Ref<Account>
-): Promise<Tx[]> {
-  console.log('merge employee:', sourceAccount.name, 'to', targetAccount.name)
-  // Move all possible references to Account and Employee and replace to target one.
-  const reftos = (await control.modelDb.findAll(core.class.Attribute, { 'type._class': core.class.RefTo })).filter(
-    (it) => {
-      const to = it.type as RefTo<Doc>
-      return to.to === contact.class.Employee || to.to === core.class.Account || to.to === contact.class.EmployeeAccount
-    }
-  )
-
-  for (const attr of reftos) {
-    if (attr.name === '_id') {
-      continue
-    }
-    const to = attr.type as RefTo<Doc>
-    if (to.to === contact.class.Employee) {
-      const descendants = control.hierarchy.getDescendants(attr.attributeOf)
-      for (const d of descendants) {
-        if (control.hierarchy.isDerived(d, core.class.Tx)) {
-          continue
-        }
-        if (control.hierarchy.findDomain(d) !== undefined) {
-          while (true) {
-            const values = await control.findAll(d, { [attr.name]: sourceAccount.employee }, { limit: 100 })
-            if (values.length === 0) {
-              break
-            }
-
-            const builder = new TxBuilder(control.hierarchy, control.modelDb, modifiedBy)
-            for (const v of values) {
-              await updateAttribute(builder, v, d, { key: attr.name, attr }, targetAccount.employee, targetAccount._id)
-            }
-            if (builder.txes.length > 0) {
-              console.log('merge employee:', sourceAccount.name, 'to', targetAccount.name, d, builder.txes.length)
-              await control.apply(builder.txes, false)
-            }
-          }
-        }
-      }
-    }
-    if (
-      (to.to === contact.class.EmployeeAccount || to.to === core.class.Account) &&
-      sourceAccount !== undefined &&
-      targetAccount !== undefined
-    ) {
-      const descendants = control.hierarchy.getDescendants(attr.attributeOf)
-      for (const d of descendants) {
-        if (control.hierarchy.isDerived(d, core.class.Tx)) {
-          continue
-        }
-        if (control.hierarchy.findDomain(d) !== undefined) {
-          while (true) {
-            const values = await control.findAll(d, { [attr.name]: sourceAccount._id }, { limit: 100 })
-            if (values.length === 0) {
-              break
-            }
-            const builder = new TxBuilder(control.hierarchy, control.modelDb, modifiedBy)
-            for (const v of values) {
-              await updateAttribute(builder, v, d, { key: attr.name, attr }, targetAccount._id, targetAccount._id)
-            }
-            if (builder.txes.length > 0) {
-              console.log('merge employee:', sourceAccount.name, 'to', targetAccount.name, d, builder.txes.length)
-              await control.apply(builder.txes, false)
-            }
-          }
-        }
-      }
-    }
-  }
-  const arrs = await control.findAll(core.class.Attribute, { 'type._class': core.class.ArrOf })
-  for (const attr of arrs) {
-    if (attr.name === '_id') {
-      continue
-    }
-    const to = attr.type as RefTo<Doc>
-    if (to.to === contact.class.Employee) {
-      const descendants = control.hierarchy.getDescendants(attr.attributeOf)
-      for (const d of descendants) {
-        if (control.hierarchy.isDerived(d, core.class.Tx)) {
-          continue
-        }
-        if (control.hierarchy.findDomain(d) !== undefined) {
-          while (true) {
-            const values = await control.findAll(
-              attr.attributeOf,
-              { [attr.name]: sourceAccount.employee },
-              { limit: 100 }
-            )
-            if (values.length === 0) {
-              break
-            }
-            const builder = new TxBuilder(control.hierarchy, control.modelDb, modifiedBy)
-            for (const v of values) {
-              await updateAttribute(builder, v, d, { key: attr.name, attr }, targetAccount.employee, targetAccount._id)
-            }
-            if (builder.txes.length > 0) {
-              console.log('merge employee:', sourceAccount.name, 'to', targetAccount.name, d, builder.txes.length)
-              await control.apply(builder.txes, false)
-            }
-          }
-        }
-      }
-    }
-    if (
-      (to.to === contact.class.EmployeeAccount || to.to === core.class.Account) &&
-      sourceAccount !== undefined &&
-      targetAccount !== undefined
-    ) {
-      const descendants = control.hierarchy.getDescendants(attr.attributeOf)
-      for (const d of descendants) {
-        if (control.hierarchy.isDerived(d, core.class.Tx)) {
-          continue
-        }
-        if (control.hierarchy.findDomain(d) !== undefined) {
-          while (true) {
-            const values = await control.findAll(d, { [attr.name]: sourceAccount._id }, { limit: 100 })
-            if (values.length === 0) {
-              break
-            }
-            const builder = new TxBuilder(control.hierarchy, control.modelDb, modifiedBy)
-            for (const v of values) {
-              await updateAttribute(builder, v, d, { key: attr.name, attr }, targetAccount._id, targetAccount._id)
-            }
-            if (builder.txes.length > 0) {
-              console.log('merge employee:', sourceAccount.name, 'to', targetAccount.name, d, builder.txes.length)
-              await control.apply(builder.txes, false)
-            }
-          }
-        }
-      }
-    }
-  }
-  const employee = (await control.findAll(contact.class.Employee, { _id: sourceAccount.employee })).shift()
-
-  const builder = new TxBuilder(control.hierarchy, control.modelDb, modifiedBy)
-  if (employee !== undefined) {
-    await builder.remove(employee)
-  }
-  await builder.update(sourceAccount, { mergedTo: targetAccount._id })
-  await control.apply(builder.txes, true)
-
-  return []
-}
-
-async function mergeEmployee (control: TriggerControl, uTx: TxUpdateDoc<Employee>): Promise<Tx[]> {
-  if (uTx.operations.mergedTo === undefined) return []
-  const target = uTx.operations.mergedTo
-
-  const attributes = control.hierarchy.getAllAttributes(contact.class.Employee)
-
-  for (const attribute of attributes) {
-    if (control.hierarchy.isDerived(attribute[1].type._class, core.class.Collection)) {
-      if (attribute[1]._id === contact.class.Contact + '_channels') continue
-      const collection = attribute[1].type as Collection<AttachedDoc>
-      const res: Tx[] = []
-      while (true) {
-        const allAttached = await control.findAll(collection.of, { attachedTo: uTx.objectId }, { limit: 100 })
-        if (allAttached.length === 0) {
-          break
-        }
-        for (const attached of allAttached) {
-          const tx = control.txFactory.createTxUpdateDoc(attached._class, attached.space, attached._id, {
-            attachedTo: target
-          })
-          const parent = control.txFactory.createTxCollectionCUD(
-            attached.attachedToClass,
-            target,
-            attached.space,
-            attached.collection,
-            tx
-          )
-          res.push(parent)
-        }
-        await control.apply(res, false)
-      }
-    }
-  }
-
-  const oldEmployeeAccount = (
-    await control.modelDb.findAll(contact.class.EmployeeAccount, { employee: uTx.objectId })
-  )[0]
-  const newEmployeeAccount = (await control.modelDb.findAll(contact.class.EmployeeAccount, { employee: target }))[0]
-
-  if (oldEmployeeAccount === undefined || newEmployeeAccount === undefined) {
-    return []
-  }
-  return await updateAllRefs(control, oldEmployeeAccount, newEmployeeAccount, uTx.modifiedOn, uTx.modifiedBy)
-}
-
-/**
- * @public
- */
-export async function OnEmployeeUpdate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
-  const uTx = tx as TxUpdateDoc<Employee>
-
-  const result: Tx[] = []
-
-  const txes = await mergeEmployee(control, uTx)
-  result.push(...txes)
-
-  return result
-}
-
 /**
  * @public
  */
@@ -360,15 +128,15 @@ export async function personHTMLPresenter (doc: Doc, control: TriggerControl): P
   const front = getMetadata(serverCore.metadata.FrontUrl) ?? ''
   const path = `${workbenchId}/${control.workspace.name}/${contactId}/${doc._id}`
   const link = concatLink(front, path)
-  return `<a href="${link}">${getName(person)}</a>`
+  return `<a href="${link}">${getName(control.hierarchy, person)}</a>`
 }
 
 /**
  * @public
  */
-export function personTextPresenter (doc: Doc): string {
+export function personTextPresenter (doc: Doc, control: TriggerControl): string {
   const person = doc as Person
-  return `${getName(person)}`
+  return `${getName(control.hierarchy, person)}`
 }
 
 /**
@@ -394,7 +162,6 @@ export function organizationTextPresenter (doc: Doc): string {
 export default async () => ({
   trigger: {
     OnContactDelete,
-    OnEmployeeUpdate,
     OnChannelUpdate
   },
   function: {
diff --git a/server-plugins/contact/src/index.ts b/server-plugins/contact/src/index.ts
index f8929a8380..f21ea8a543 100644
--- a/server-plugins/contact/src/index.ts
+++ b/server-plugins/contact/src/index.ts
@@ -30,8 +30,7 @@ export const serverContactId = 'server-contact' as Plugin
 export default plugin(serverContactId, {
   trigger: {
     OnContactDelete: '' as Resource<TriggerFunc>,
-    OnChannelUpdate: '' as Resource<TriggerFunc>,
-    OnEmployeeUpdate: '' as Resource<TriggerFunc>
+    OnChannelUpdate: '' as Resource<TriggerFunc>
   },
   function: {
     PersonHTMLPresenter: '' as Resource<Presenter>,
diff --git a/server-plugins/hr-resources/src/index.ts b/server-plugins/hr-resources/src/index.ts
index 618b3fc510..f3d29050f1 100644
--- a/server-plugins/hr-resources/src/index.ts
+++ b/server-plugins/hr-resources/src/index.ts
@@ -13,7 +13,7 @@
 // limitations under the License.
 //
 
-import contact, { Contact, Employee, EmployeeAccount, formatName, getName } from '@hcengineering/contact'
+import contact, { Contact, Employee, PersonAccount, formatName, getName } from '@hcengineering/contact'
 import core, {
   Doc,
   Ref,
@@ -39,7 +39,7 @@ import hr, {
 import notification, { NotificationType } from '@hcengineering/notification'
 import { translate } from '@hcengineering/platform'
 import { TriggerControl } from '@hcengineering/server-core'
-import { getEmployee, getEmployeeAccountById } from '@hcengineering/server-notification'
+import { getEmployee, getPersonAccountById } from '@hcengineering/server-notification'
 import { getContent, isAllowed } from '@hcengineering/server-notification-resources'
 
 async function getOldDepartment (
@@ -120,8 +120,8 @@ export async function OnDepartmentStaff (tx: Tx, control: TriggerControl): Promi
   const ctx = TxProcessor.extractTx(tx) as TxMixin<Employee, Staff>
 
   const targetAccount = (
-    await control.modelDb.findAll(contact.class.EmployeeAccount, {
-      employee: ctx.objectId
+    await control.modelDb.findAll(contact.class.PersonAccount, {
+      person: ctx.objectId
     })
   )[0]
   if (targetAccount === undefined) return []
@@ -164,12 +164,12 @@ export async function OnDepartmentRemove (tx: Tx, control: TriggerControl): Prom
 
   const department = (await control.findAll(hr.class.Department, { _id: ctx.objectSpace as Ref<Department> }))[0]
 
-  const targetAccounts = await control.modelDb.findAll(contact.class.EmployeeAccount, {
+  const targetAccounts = await control.modelDb.findAll(contact.class.PersonAccount, {
     _id: { $in: department.members }
   })
-  const employeeIds = targetAccounts.map((acc) => acc.employee as Ref<Staff>)
+  const employeeIds = targetAccounts.map((acc) => acc.person as Ref<Staff>)
 
-  const employee = await control.findAll(contact.class.Employee, {
+  const employee = await control.findAll(contact.mixin.Employee, {
     _id: { $in: employeeIds }
   })
   const removed = await buildHierarchy(department._id, control)
@@ -199,13 +199,13 @@ export async function OnEmployeeDeactivate (tx: Tx, control: TriggerControl): Pr
     return []
   }
   const ctx = actualTx as TxUpdateDoc<Employee>
-  if (ctx.objectClass !== contact.class.Employee || ctx.operations.active !== false) {
+  if (ctx.objectClass !== contact.mixin.Employee || ctx.operations.active !== false) {
     return []
   }
 
   const targetAccount = (
-    await control.modelDb.findAll(contact.class.EmployeeAccount, {
-      employee: ctx.objectId
+    await control.modelDb.findAll(contact.class.PersonAccount, {
+      person: ctx.objectId
     })
   )[0]
   if (targetAccount === undefined) return []
@@ -223,7 +223,7 @@ export async function OnEmployeeDeactivate (tx: Tx, control: TriggerControl): Pr
 
 async function getEmailNotification (
   control: TriggerControl,
-  sender: EmployeeAccount,
+  sender: PersonAccount,
   doc: Request | PublicHoliday,
   space: Ref<Department>,
   type: Ref<NotificationType>
@@ -238,13 +238,13 @@ async function getEmailNotification (
   }
 
   // should respect employee settings
-  const accounts = await control.modelDb.findAll(contact.class.EmployeeAccount, {
-    employee: { $in: Array.from(contacts.values()) as Ref<Employee>[] }
+  const accounts = await control.modelDb.findAll(contact.class.PersonAccount, {
+    person: { $in: Array.from(contacts.values()) as Ref<Employee>[] }
   })
   for (const account of accounts) {
     const allowed = await isAllowed(control, account._id, type, notification.providers.EmailNotification)
     if (!allowed) {
-      contacts.delete(account.employee)
+      contacts.delete(account.person)
     }
   }
 
@@ -282,7 +282,7 @@ async function getEmailNotification (
 export async function OnRequestCreate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
   const ctx = TxProcessor.extractTx(tx) as TxCreateDoc<Request>
 
-  const sender = await getEmployeeAccountById(ctx.modifiedBy, control)
+  const sender = await getPersonAccountById(ctx.modifiedBy, control)
   if (sender === undefined) return []
 
   const request = TxProcessor.createDoc2Doc(ctx)
@@ -302,7 +302,7 @@ export async function OnRequestCreate (tx: Tx, control: TriggerControl): Promise
 export async function OnRequestUpdate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
   const ctx = TxProcessor.extractTx(tx) as TxUpdateDoc<Request>
 
-  const sender = await getEmployeeAccountById(ctx.modifiedBy, control)
+  const sender = await getPersonAccountById(ctx.modifiedBy, control)
   if (sender === undefined) return []
 
   const request = (await control.findAll(hr.class.Request, { _id: ctx.objectId }))[0] as Request
@@ -323,7 +323,7 @@ export async function OnRequestUpdate (tx: Tx, control: TriggerControl): Promise
 export async function OnRequestRemove (tx: Tx, control: TriggerControl): Promise<Tx[]> {
   const ctx = TxProcessor.extractTx(tx) as TxCreateDoc<Request>
 
-  const sender = await getEmployeeAccountById(ctx.modifiedBy, control)
+  const sender = await getPersonAccountById(ctx.modifiedBy, control)
   if (sender === undefined) return []
 
   const request = control.removedMap.get(ctx.objectId) as Request
@@ -343,8 +343,8 @@ export async function OnRequestRemove (tx: Tx, control: TriggerControl): Promise
  */
 export async function RequestHTMLPresenter (doc: Doc, control: TriggerControl): Promise<string> {
   const request = doc as Request
-  const employee = (await control.findAll(contact.class.Employee, { _id: request.attachedTo }))[0]
-  const who = getName(employee)
+  const employee = (await control.findAll(contact.mixin.Employee, { _id: request.attachedTo }))[0]
+  const who = getName(control.hierarchy, employee)
   const type = await translate(control.modelDb.getObject(request.type).label, {})
 
   const date = tzDateEqual(request.tzDate, request.tzDueDate)
@@ -361,8 +361,8 @@ export async function RequestHTMLPresenter (doc: Doc, control: TriggerControl):
  */
 export async function RequestTextPresenter (doc: Doc, control: TriggerControl): Promise<string> {
   const request = doc as Request
-  const employee = (await control.findAll(contact.class.Employee, { _id: request.attachedTo }))[0]
-  const who = getName(employee)
+  const employee = (await control.findAll(contact.mixin.Employee, { _id: request.attachedTo }))[0]
+  const who = getName(control.hierarchy, employee)
   const type = await translate(control.modelDb.getObject(request.type).label, {})
 
   const date = tzDateEqual(request.tzDate, request.tzDueDate)
@@ -380,9 +380,9 @@ export async function RequestTextPresenter (doc: Doc, control: TriggerControl):
 export async function OnPublicHolidayCreate (tx: Tx, control: TriggerControl): Promise<Tx[]> {
   const ctx = TxProcessor.extractTx(tx) as TxCreateDoc<PublicHoliday>
 
-  const sender = await getEmployeeAccountById(ctx.modifiedBy, control)
+  const sender = await getPersonAccountById(ctx.modifiedBy, control)
   if (sender === undefined) return []
-  const employee = await getEmployee(sender.employee, control)
+  const employee = await getEmployee(sender.person as Ref<Employee>, control)
   if (employee === undefined) return []
 
   const publicHoliday = TxProcessor.createDoc2Doc(ctx)
@@ -400,9 +400,9 @@ export async function OnPublicHolidayCreate (tx: Tx, control: TriggerControl): P
  */
 export async function PublicHolidayHTMLPresenter (doc: Doc, control: TriggerControl): Promise<string> {
   const holiday = doc as PublicHoliday
-  const sender = await getEmployeeAccountById(holiday.modifiedBy, control)
+  const sender = await getPersonAccountById(holiday.modifiedBy, control)
   if (sender === undefined) return ''
-  const employee = await getEmployee(sender.employee, control)
+  const employee = await getEmployee(sender.person as Ref<Employee>, control)
   if (employee === undefined) return ''
   const who = formatName(employee.name)
 
@@ -416,9 +416,9 @@ export async function PublicHolidayHTMLPresenter (doc: Doc, control: TriggerCont
  */
 export async function PublicHolidayTextPresenter (doc: Doc, control: TriggerControl): Promise<string> {
   const holiday = doc as PublicHoliday
-  const sender = await getEmployeeAccountById(holiday.modifiedBy, control)
+  const sender = await getPersonAccountById(holiday.modifiedBy, control)
   if (sender === undefined) return ''
-  const employee = await getEmployee(sender.employee, control)
+  const employee = await getEmployee(sender.person as Ref<Employee>, control)
   if (employee === undefined) return ''
   const who = formatName(employee.name)
 
diff --git a/server-plugins/notification-resources/src/index.ts b/server-plugins/notification-resources/src/index.ts
index 3979653956..0db66810e4 100644
--- a/server-plugins/notification-resources/src/index.ts
+++ b/server-plugins/notification-resources/src/index.ts
@@ -15,7 +15,7 @@
 //
 
 import chunter, { Backlink } from '@hcengineering/chunter'
-import contact, { Employee, EmployeeAccount, formatName } from '@hcengineering/contact'
+import contact, { Employee, PersonAccount, formatName } from '@hcengineering/contact'
 import core, {
   Account,
   AnyAttribute,
@@ -54,8 +54,8 @@ import type { TriggerControl } from '@hcengineering/server-core'
 import serverNotification, {
   HTMLPresenter,
   TextPresenter,
-  getEmployeeAccount,
-  getEmployeeAccountById
+  getPersonAccount,
+  getPersonAccountById
 } from '@hcengineering/server-notification'
 import { Content } from './types'
 import { replaceAll } from './utils'
@@ -70,10 +70,10 @@ export async function OnBacklinkCreate (tx: Tx, control: TriggerControl): Promis
 
   if (!checkTx(ptx, hierarchy)) return []
 
-  const receiver = await getEmployeeAccount(ptx.objectId as Ref<Employee>, control)
+  const receiver = await getPersonAccount(ptx.objectId as Ref<Employee>, control)
   if (receiver === undefined) return []
 
-  const sender = await getEmployeeAccountById(ptx.modifiedBy, control)
+  const sender = await getPersonAccountById(ptx.modifiedBy, control)
   if (sender === undefined) return []
   const backlink = getBacklink(ptx)
   const doc = await getBacklinkDoc(backlink, control)
@@ -106,7 +106,7 @@ function checkTx (ptx: TxCollectionCUD<Doc, Backlink>, hierarchy: Hierarchy): bo
   if (
     ptx.tx._class !== core.class.TxCreateDoc ||
     !hierarchy.isDerived(ptx.tx.objectClass, chunter.class.Backlink) ||
-    !hierarchy.isDerived(ptx.objectClass, contact.class.Employee)
+    !hierarchy.isDerived(ptx.objectClass, contact.mixin.Employee)
   ) {
     return false
   }
@@ -118,7 +118,7 @@ function checkTx (ptx: TxCollectionCUD<Doc, Backlink>, hierarchy: Hierarchy): bo
  */
 export async function isAllowed (
   control: TriggerControl,
-  receiver: Ref<EmployeeAccount>,
+  receiver: Ref<PersonAccount>,
   typeId: Ref<NotificationType>,
   providerId: Ref<NotificationProvider>
 ): Promise<boolean> {
@@ -213,13 +213,13 @@ async function createEmailNotificationTxes (
   tx: Tx,
   type: Ref<NotificationType>,
   doc: Doc | undefined,
-  senderId: Ref<EmployeeAccount>,
-  receiverId: Ref<EmployeeAccount>,
+  senderId: Ref<PersonAccount>,
+  receiverId: Ref<PersonAccount>,
   data: string = ''
 ): Promise<Tx | undefined> {
-  const sender = (await control.modelDb.findAll(contact.class.EmployeeAccount, { _id: senderId }))[0]
+  const sender = (await control.modelDb.findAll(contact.class.PersonAccount, { _id: senderId }))[0]
 
-  const receiver = (await control.modelDb.findAll(contact.class.EmployeeAccount, { _id: receiverId }))[0]
+  const receiver = (await control.modelDb.findAll(contact.class.PersonAccount, { _id: receiverId }))[0]
   if (receiver === undefined) return
 
   const senderName = sender !== undefined ? formatName(sender.name) : ''
@@ -237,7 +237,7 @@ async function getEmailNotificationTx (
   text: string,
   html: string,
   subject: string,
-  receiver: EmployeeAccount
+  receiver: PersonAccount
 ): Promise<TxCreateDoc<EmailNotification> | undefined> {
   return {
     _id: generateId(),
@@ -279,24 +279,24 @@ async function getValueCollaborators (value: any, attr: AnyAttribute, control: T
   const hierarchy = control.hierarchy
   if (attr.type._class === core.class.RefTo) {
     const to = (attr.type as RefTo<Doc>).to
-    if (hierarchy.isDerived(to, contact.class.Employee)) {
-      const acc = await getEmployeeAccount(value, control)
+    if (hierarchy.isDerived(to, contact.mixin.Employee)) {
+      const acc = await getPersonAccount(value, control)
       return acc !== undefined ? [acc._id] : []
     } else if (hierarchy.isDerived(to, core.class.Account)) {
-      const acc = await getEmployeeAccountById(value, control)
+      const acc = await getPersonAccountById(value, control)
       return acc !== undefined ? [acc._id] : []
     }
   } else if (attr.type._class === core.class.ArrOf) {
     const arrOf = (attr.type as ArrOf<RefTo<Doc>>).of
     if (arrOf._class === core.class.RefTo) {
       const to = (arrOf as RefTo<Doc>).to
-      if (hierarchy.isDerived(to, contact.class.Employee)) {
-        const employeeAccounts = await control.modelDb.findAll(contact.class.EmployeeAccount, {
-          employee: { $in: Array.isArray(value) ? value : [value] }
+      if (hierarchy.isDerived(to, contact.mixin.Employee)) {
+        const employeeAccounts = await control.modelDb.findAll(contact.class.PersonAccount, {
+          person: { $in: Array.isArray(value) ? value : [value] }
         })
         return employeeAccounts.map((p) => p._id)
       } else if (hierarchy.isDerived(to, core.class.Account)) {
-        const employeeAccounts = await control.modelDb.findAll(contact.class.EmployeeAccount, {
+        const employeeAccounts = await control.modelDb.findAll(contact.class.PersonAccount, {
           _id: { $in: Array.isArray(value) ? value : [value] }
         })
         return employeeAccounts.map((p) => p._id)
@@ -419,10 +419,10 @@ async function isShouldNotify (
         if (!res) continue
       }
     }
-    if (await isAllowed(control, user as Ref<EmployeeAccount>, type._id, notification.providers.PlatformNotification)) {
+    if (await isAllowed(control, user as Ref<PersonAccount>, type._id, notification.providers.PlatformNotification)) {
       allowed = true
     }
-    if (await isAllowed(control, user as Ref<EmployeeAccount>, type._id, notification.providers.EmailNotification)) {
+    if (await isAllowed(control, user as Ref<PersonAccount>, type._id, notification.providers.EmailNotification)) {
       emailTypes.push(type)
     }
   }
@@ -488,8 +488,8 @@ async function getNotificationTxes (
       originTx,
       type._id,
       object,
-      originTx.modifiedBy as Ref<EmployeeAccount>,
-      target as Ref<EmployeeAccount>
+      originTx.modifiedBy as Ref<PersonAccount>,
+      target as Ref<PersonAccount>
     )
     if (emailTx !== undefined) {
       res.push(emailTx)
@@ -640,7 +640,7 @@ async function updateCollaboratorsMixin (
         if (
           await isAllowed(
             control,
-            collab as Ref<EmployeeAccount>,
+            collab as Ref<PersonAccount>,
             notification.ids.CollaboratoAddNotification,
             notification.providers.PlatformNotification
           )
@@ -822,14 +822,12 @@ export async function isUserEmployeeInFieldValue (
   if (type.field === undefined) return false
   const value = (doc as any)[type.field]
   if (value === undefined) return false
-  const employee = (
-    await control.modelDb.findAll(contact.class.EmployeeAccount, { _id: user as Ref<EmployeeAccount> })
-  )[0]
+  const employee = (await control.modelDb.findAll(contact.class.PersonAccount, { _id: user as Ref<PersonAccount> }))[0]
   if (employee === undefined) return false
   if (Array.isArray(value)) {
-    return value.includes(employee.employee)
+    return value.includes(employee.person)
   } else {
-    return value === employee.employee
+    return value === employee.person
   }
 }
 
diff --git a/server-plugins/notification/src/index.ts b/server-plugins/notification/src/index.ts
index b4f3ea024e..b7359757cc 100644
--- a/server-plugins/notification/src/index.ts
+++ b/server-plugins/notification/src/index.ts
@@ -14,7 +14,7 @@
 // limitations under the License.
 //
 
-import contact, { Employee, EmployeeAccount } from '@hcengineering/contact'
+import contact, { Employee, PersonAccount } from '@hcengineering/contact'
 import { Account, Class, Doc, Mixin, Ref, Tx } from '@hcengineering/core'
 import { NotificationType } from '@hcengineering/notification'
 import { Plugin, Resource, plugin } from '@hcengineering/platform'
@@ -28,13 +28,13 @@ export const serverNotificationId = 'server-notification' as Plugin
 /**
  * @public
  */
-export async function getEmployeeAccount (
+export async function getPersonAccount (
   employee: Ref<Employee>,
   control: TriggerControl
-): Promise<EmployeeAccount | undefined> {
+): Promise<PersonAccount | undefined> {
   const account = (
     await control.modelDb.findAll(
-      contact.class.EmployeeAccount,
+      contact.class.PersonAccount,
       {
         employee
       },
@@ -47,15 +47,15 @@ export async function getEmployeeAccount (
 /**
  * @public
  */
-export async function getEmployeeAccountById (
+export async function getPersonAccountById (
   _id: Ref<Account>,
   control: TriggerControl
-): Promise<EmployeeAccount | undefined> {
+): Promise<PersonAccount | undefined> {
   const account = (
     await control.modelDb.findAll(
-      contact.class.EmployeeAccount,
+      contact.class.PersonAccount,
       {
-        _id: _id as Ref<EmployeeAccount>
+        _id: _id as Ref<PersonAccount>
       },
       { limit: 1 }
     )
@@ -69,7 +69,7 @@ export async function getEmployeeAccountById (
 export async function getEmployee (employee: Ref<Employee>, control: TriggerControl): Promise<Employee | undefined> {
   const account = (
     await control.findAll(
-      contact.class.Employee,
+      contact.mixin.Employee,
       {
         _id: employee
       },
diff --git a/server/account/src/index.ts b/server/account/src/index.ts
index ee18443105..43acd391dd 100644
--- a/server/account/src/index.ts
+++ b/server/account/src/index.ts
@@ -19,7 +19,8 @@ import contact, {
   checkHasGravatar,
   combineName,
   Employee,
-  getAvatarColorForId
+  getAvatarColorForId,
+  Person
 } from '@hcengineering/contact'
 import core, {
   AccountRole,
@@ -774,7 +775,7 @@ export async function setRole (email: string, workspace: string, productId: stri
   try {
     const ops = new TxOperations(connection, core.account.System)
 
-    const existingAccount = await ops.findOne(contact.class.EmployeeAccount, { email })
+    const existingAccount = await ops.findOne(contact.class.PersonAccount, { email })
 
     if (existingAccount !== undefined) {
       const value = isNaN(Number(role)) ? 0 : Number(role)
@@ -798,7 +799,7 @@ export async function assignWorkspace (db: Db, productId: string, email: string,
   const { workspaceId, accountId } = await getWorkspaceAndAccount(db, productId, email, workspace)
   const account = await db.collection<Account>(ACCOUNT_COLLECTION).findOne({ _id: accountId })
 
-  if (account !== null) await createEmployeeAccount(account, productId, workspace)
+  if (account !== null) await createPersonAccount(account, productId, workspace)
 
   // Add account into workspace.
   await db.collection(WORKSPACE_COLLECTION).updateOne({ _id: workspaceId }, { $addToSet: { accounts: accountId } })
@@ -807,22 +808,24 @@ export async function assignWorkspace (db: Db, productId: string, email: string,
   await db.collection(ACCOUNT_COLLECTION).updateOne({ _id: accountId }, { $addToSet: { workspaces: workspaceId } })
 }
 
-async function createEmployee (ops: TxOperations, name: string, email: string): Promise<Ref<Employee>> {
+async function createEmployee (ops: TxOperations, name: string, email: string): Promise<Ref<Person>> {
   const gravatarId = buildGravatarId(email)
   const hasGravatar = await checkHasGravatar(gravatarId)
 
-  const id = await ops.createDoc(contact.class.Employee, contact.space.Employee, {
+  const id = await ops.createDoc(contact.class.Person, contact.space.Employee, {
     name,
     city: '',
-    ...(hasGravatar ? { avatar: `${AvatarType.GRAVATAR}://${gravatarId}` } : {}),
+    ...(hasGravatar ? { avatar: `${AvatarType.GRAVATAR}://${gravatarId}` } : {})
+  })
+  await ops.createMixin(id, contact.class.Person, contact.space.Contacts, contact.mixin.Employee, {
     active: true
   })
   if (!hasGravatar) {
-    await ops.updateDoc(contact.class.Employee, contact.space.Employee, id, {
+    await ops.updateDoc(contact.mixin.Employee, contact.space.Employee, id, {
       avatar: `${AvatarType.COLOR}://${getAvatarColorForId(id)}`
     })
   }
-  await ops.addCollection(contact.class.Channel, contact.space.Contacts, id, contact.class.Employee, 'channels', {
+  await ops.addCollection(contact.class.Channel, contact.space.Contacts, id, contact.mixin.Employee, 'channels', {
     provider: contact.channelProvider.Email,
     value: email.trim()
   })
@@ -830,38 +833,33 @@ async function createEmployee (ops: TxOperations, name: string, email: string):
   return id
 }
 
-async function createEmployeeAccount (account: Account, productId: string, workspace: string): Promise<void> {
+async function createPersonAccount (account: Account, productId: string, workspace: string): Promise<void> {
   const connection = await connect(getTransactor(), getWorkspaceId(workspace, productId))
   try {
     const ops = new TxOperations(connection, core.account.System)
 
     const name = combineName(account.first, account.last)
     // Check if EmployeeAccoun is not exists
-    const existingAccount = await ops.findOne(contact.class.EmployeeAccount, { email: account.email })
+    const existingAccount = await ops.findOne(contact.class.PersonAccount, { email: account.email })
     if (existingAccount === undefined) {
       const employee = await createEmployee(ops, name, account.email)
 
-      await ops.createDoc(contact.class.EmployeeAccount, core.space.Model, {
+      await ops.createDoc(contact.class.PersonAccount, core.space.Model, {
         email: account.email,
-        employee,
+        person: employee,
         name,
         role: 0
       })
     } else {
-      const employee = await ops.findOne(contact.class.Employee, { _id: existingAccount.employee })
+      const employee = await ops.findOne(contact.mixin.Employee, { _id: existingAccount.person as Ref<Employee> })
       if (employee === undefined) {
         // Employee was deleted, let's restore it.
         const employeeId = await createEmployee(ops, name, account.email)
 
-        await ops.updateDoc(contact.class.EmployeeAccount, existingAccount.space, existingAccount._id, {
-          employee: employeeId
+        await ops.updateDoc(contact.class.PersonAccount, existingAccount.space, existingAccount._id, {
+          person: employeeId
         })
       } else if (!employee.active) {
-        if (employee.mergedTo !== undefined) {
-          throw new PlatformError(
-            new Status(Severity.ERROR, platform.status.AccountWasMerged, { account: account.email })
-          )
-        }
         await ops.update(employee, {
           active: true
         })
@@ -998,26 +996,26 @@ export async function changeName (db: Db, productId: string, token: string, firs
 
   const promises: Promise<void>[] = []
   for (const ws of workspaces) {
-    promises.push(updateEmployeeAccount(account, ws.workspace, ws.productId))
+    promises.push(updatePersonAccount(account, ws.workspace, ws.productId))
   }
   await Promise.all(promises)
 }
 
-async function updateEmployeeAccount (account: Account, workspace: string, productId: string): Promise<void> {
+async function updatePersonAccount (account: Account, workspace: string, productId: string): Promise<void> {
   const connection = await connect(getTransactor(), getWorkspaceId(workspace, productId), account.email)
   try {
     const ops = new TxOperations(connection, core.account.System)
 
     const name = combineName(account.first, account.last)
 
-    const employeeAccount = await ops.findOne(contact.class.EmployeeAccount, { email: account.email })
+    const employeeAccount = await ops.findOne(contact.class.PersonAccount, { email: account.email })
     if (employeeAccount === undefined) return
 
     await ops.update(employeeAccount, {
       name
     })
 
-    const employee = await ops.findOne(contact.class.Employee, { _id: employeeAccount.employee })
+    const employee = await ops.findOne(contact.mixin.Employee, { _id: employeeAccount.person as Ref<Employee> })
     if (employee === undefined) return
 
     await ops.update(employee, {
@@ -1086,7 +1084,7 @@ export async function dropAccount (db: Db, productId: string, email: string): Pr
 
   await Promise.all(
     workspaces.map(async (ws) => {
-      return await deactivateEmployeeAccount(account.email, ws.workspace, productId)
+      return await deactivatePersonAccount(account.email, ws.workspace, productId)
     })
   )
 
@@ -1114,7 +1112,7 @@ export async function leaveWorkspace (db: Db, productId: string, token: string,
     )
   }
 
-  await deactivateEmployeeAccount(email, workspace.workspace, workspace.productId)
+  await deactivatePersonAccount(email, workspace.workspace, workspace.productId)
 
   const account = tokenData.email !== email ? await getAccount(db, email) : currentAccount
   if (account !== null) {
@@ -1183,15 +1181,15 @@ export async function sendInvite (db: Db, productId: string, token: string, emai
   })
 }
 
-async function deactivateEmployeeAccount (email: string, workspace: string, productId: string): Promise<void> {
+async function deactivatePersonAccount (email: string, workspace: string, productId: string): Promise<void> {
   const connection = await connect(getTransactor(), getWorkspaceId(workspace, productId), email)
   try {
     const ops = new TxOperations(connection, core.account.System)
 
-    const existingAccount = await ops.findOne(contact.class.EmployeeAccount, { email })
+    const existingAccount = await ops.findOne(contact.class.PersonAccount, { email })
 
     if (existingAccount !== undefined) {
-      const employee = await ops.findOne(contact.class.Employee, { _id: existingAccount.employee })
+      const employee = await ops.findOne(contact.mixin.Employee, { _id: existingAccount.person as Ref<Employee> })
       if (employee !== undefined) {
         await ops.update(employee, {
           active: false
diff --git a/server/mongo/src/storage.ts b/server/mongo/src/storage.ts
index 5d25f8fbe4..f34fcbfcde 100644
--- a/server/mongo/src/storage.ts
+++ b/server/mongo/src/storage.ts
@@ -1034,18 +1034,17 @@ class MongoTxAdapter extends MongoAdapterBase implements TxAdapter {
     const userTx: Tx[] = []
 
     // Ignore Employee accounts.
-    function isEmployeeAccount (tx: Tx): boolean {
+    function isPersonAccount (tx: Tx): boolean {
       return (
         (tx._class === core.class.TxCreateDoc ||
           tx._class === core.class.TxUpdateDoc ||
           tx._class === core.class.TxRemoveDoc) &&
-        (tx as TxCUD<Doc>).objectClass === 'contact:class:EmployeeAccount'
+        ((tx as TxCUD<Doc>).objectClass === 'contact:class:PersonAccount' ||
+          (tx as TxCUD<Doc>).objectClass === 'contact:class:EmployeeAccount')
       )
     }
 
-    model.forEach((tx) =>
-      (tx.modifiedBy === core.account.System && !isEmployeeAccount(tx) ? systemTx : userTx).push(tx)
-    )
+    model.forEach((tx) => (tx.modifiedBy === core.account.System && !isPersonAccount(tx) ? systemTx : userTx).push(tx))
     return systemTx.concat(userTx)
   }
 }
diff --git a/server/tool/src/index.ts b/server/tool/src/index.ts
index 7e5414c8af..8f631ff54d 100644
--- a/server/tool/src/index.ts
+++ b/server/tool/src/index.ts
@@ -165,7 +165,7 @@ export async function upgradeModel (
     const result = await db.collection(DOMAIN_TX).deleteMany({
       objectSpace: core.space.Model,
       modifiedBy: core.account.System,
-      objectClass: { $ne: contact.class.EmployeeAccount }
+      objectClass: { $nin: [contact.class.PersonAccount, 'contact:class:EmployeeAccount'] }
     })
     console.log(`${workspaceId.name}: ${result.deletedCount} transactions deleted.`)
 
diff --git a/server/ws/src/client.ts b/server/ws/src/client.ts
index 60647a92da..5822d3a39a 100644
--- a/server/ws/src/client.ts
+++ b/server/ws/src/client.ts
@@ -73,7 +73,7 @@ export class ClientSession implements Session {
       // Generate fake account for admin user
       const account = {
         _id: core.account.System,
-        _class: 'contact:class:EmployeeAccount' as Ref<Class<Account>>,
+        _class: 'contact:class:PersonAccount' as Ref<Class<Account>>,
         name: 'System,Ghost',
         email: this.token.email,
         space: core.space.Model,