diff --git a/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/Form.vue b/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/Form.vue
index 49ec139..ab8d2d8 100644
--- a/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/Form.vue
+++ b/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/Form.vue
@@ -15,7 +15,7 @@
         >
           <v-flex>
             <h2 class="ellipsed">
-              {{ store.model.title || "..." }}
+              {{ model.title || "..." }}
             </h2>
           </v-flex>
           <v-spacer />
@@ -23,7 +23,7 @@
             <v-btn
               text
               color="primary"
-              :disabled="store.isLoading"
+              :disabled="isLoading"
               @click.stop="navigateBack"
             >
               <v-icon
@@ -32,7 +32,7 @@
                 arrow_back
               </v-icon>
               <template v-if="!$vuetify.breakpoint.xsOnly">
-                {{ $t("common.form.cancelButtonLabel") }}
+                {{ t("common.form.cancelButtonLabel") }}
               </template>
             </v-btn>
             <v-hover
@@ -61,7 +61,7 @@
             Основные
           </v-tab>
         </v-tabs>
-        <v-card v-if="store.model">
+        <v-card v-if="model">
           <v-form
             ref="form"
             @submit.prevent="onSaveAndBack"
@@ -71,27 +71,27 @@
                 <v-tab-item eager>
                   <!--  generated part -->
                   <vt-form-field
-                    v-model="store.model.title"
+                    v-model="model.title"
                     component="v-text-field"
-                    :label="$t('category.form.titleLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.title))"
-                    :disabled="store.isLoading"
+                    :label="t('category.form.titleLabel')"
+                    :error-messages="getErrorMessage(errors.title)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                   /><vt-form-field
-                    v-model="store.model.orderNumber"
+                    v-model="model.orderNumber"
                     component="v-text-field"
-                    :label="$t('category.form.orderNumberLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.orderNumber))"
-                    :disabled="store.isLoading"
+                    :label="t('category.form.orderNumberLabel')"
+                    :error-messages="getErrorMessage(errors.orderNumber)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                   /><vt-form-field
-                    v-model="store.model.statusId"
+                    v-model="model.statusId"
                     component="vt-status-select"
-                    :label="$t('category.form.statusIdLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.statusId))"
-                    :disabled="store.isLoading"
+                    :label="t('category.form.statusIdLabel')"
+                    :error-messages="getErrorMessage(errors.statusId)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                     compact
@@ -111,21 +111,21 @@
                     <v-btn
                       type="submit"
                       color="success"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="!$vuetify.breakpoint.xsOnly && 'mx-2'"
                     >
                       <v-icon left>
                         done
                       </v-icon>
-                      {{ $t("common.form.saveAndCloseButtonLabel") }}
+                      {{ t("common.form.saveAndCloseButtonLabel") }}
                     </v-btn>
 
                     <v-btn
                       v-if="$route.params.id"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="[
                         $vuetify.breakpoint.xsOnly && 'ml-0 mt-2',
@@ -135,7 +135,7 @@
                       color="accent"
                       @click.stop="onSave"
                     >
-                      {{ $t("common.form.saveButtonLabel") }}
+                      {{ t("common.form.saveButtonLabel") }}
                     </v-btn>
                     <v-spacer />
                   </v-layout>
@@ -150,17 +150,58 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
+import { useEntityForm } from '@/composables/useEntityForm';
+import { useI18n } from '@/composables/useI18n'
 import { Category as Model } from '@/services/api/factory';
-import Store from '@/common/Entity/EntityModelStore';
-import EntityForm from '@/common/Entity/EntityForm';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class Form extends EntityForm {
-  store: Store<Model> = new Store<Model>(Model);
-}
+export default defineComponent({
+  // eslint-disable-next-line vue/match-component-file-name
+  name: 'CategoryForm',
+
+  setup () {
+    const { t } = useI18n();
+
+    const {
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    } = useEntityForm<Model>({ Model} );
+
+	const getErrorMessage = (errorKey: string | null): string => {
+      const errorMessage = i18nFieldError(errorKey);
+      return errorMessage ? t(errorMessage) : '';
+    };
+
+    return {
+      t,
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+      getErrorMessage,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    };
+  }
+});
 </script>
 
 <style scoped></style>
diff --git a/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/List.vue b/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/List.vue
index f2e6d2a..261806a 100644
--- a/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/List.vue
+++ b/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/List.vue
@@ -18,27 +18,26 @@
               <v-flex>
                 <v-layout align-center>
                   <h2 class="ellipsed mr-1">
-                    {{ $t("category.list.title") }}
+                    {{ t("category.list.title") }}
                   </h2>
                   <span
-                    v-if="store.pagination.totalItems"
+                    v-if="pagination.totalItems"
                     class="text--secondary subtitle-2"
                   >
-                    {{ store.pagination.totalItems }}
+                    {{ pagination.totalItems }}
                   </span>
                 </v-layout>
               </v-flex>
               <v-spacer />
               <v-flex shrink>
                 <v-btn
+                  small
                   dark
                   color="success"
                   :to="{ name: 'categoryAdd' }"
                 >
-                  <v-icon left>
-                    add
-                  </v-icon>
-                  {{ $t("common.list.addNewLabel") }}
+                  <v-icon>add</v-icon>
+                  {{ t("common.list.addNewLabel") }}
                 </v-btn>
               </v-flex>
             </v-layout>
@@ -64,9 +63,9 @@
                     mr-sm-2
                   >
                     <v-text-field
-                      v-model="store.filters.title"
+                      v-model="filters.title"
                       :placeholder="
-                        $t('category.list.filter.quickFilterPlaceholder')
+                        t('category.list.filter.quickFilterPlaceholder')
                       "
                       hide-details
                       @keyup.enter.native="submitFilters()"
@@ -78,9 +77,10 @@
                     mr-sm-10
                   >
                     <multi-filters
-                      :filters="store.filters"
-                      :active-filters="store.activeFilters"
+                      :filters="filters"
+                      :active-filters="activeFilters"
                       @submitFilters="submitFilters"
+                      @update:filters="updateFilters"
                     />
                   </v-flex>
                   <v-flex
@@ -88,8 +88,8 @@
                     mt-sm-4
                   >
                     <vt-compact-pagination
-                      :value="store.pagination.page"
-                      :total-pages="store.pagination.totalPages"
+                      :value="pagination.page"
+                      :total-pages="pagination.totalPages"
                       @input="setCompactPagination"
                     />
                   </v-flex>
@@ -100,9 +100,9 @@
               <v-data-table
                 v-model="selected"
                 :headers="headers"
-                :items="store.list"
-                :options="store.vuetifyTableOptions"
-                :server-items-length="store.pagination.totalItems"
+                :items="list"
+                :options="vuetifyTableOptions"
+                :server-items-length="pagination.totalItems"
                 item-key="id"
                 :footer-props="{
                   itemsPerPageOptions: [10, 25, 50, 100, 500]
@@ -116,7 +116,7 @@
                   }
                 ]"
                 :show-select="false"
-                :loading="store.isLoading"
+                :loading="isLoading"
                 fixed-header
                 @update:options="setPagination"
               >
@@ -164,48 +164,76 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityList from '@/common/Entity/EntityList';
-import Store from '@/common/Entity/EntityCollectionStore';
-import {
-  CategorySummary as Model,
-  CategorySearch as SearchModel
-} from '@/services/api/factory';
+import { computed, defineComponent } from 'vue';
+import { CategorySummary, CategorySearch } from '@/services/api/factory';
+import { useEntityList } from '@/composables/useEntityList';
+import { useI18n } from '@/composables/useI18n';
+
 import MultiFilters from './components/MultiListFilters.vue';
 
-@Observer
-@Component({
+export default defineComponent({
+  // eslint-disable-next-line vue/multi-word-component-names
   name: 'List',
-  components: { MultiFilters }
-})
-export default class List extends EntityList {
-  store: Store = new Store(Model, SearchModel);
+  components: { MultiFilters },
+
+  setup () {
+    const { t } = useI18n();
 
-  get headers () {
-    return [
+    const {
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters
+    } = useEntityList(CategorySummary, CategorySearch);
+
+    const headers = computed(() => [
       {
-        text: this.$t('category.list.headers.title'),
+        text: t('category.list.headers.title'),
         value: 'title',
         align: 'left'
       },
       {
-        text: this.$t('category.list.headers.orderNumber'),
+        text: t('category.list.headers.orderNumber'),
         value: 'orderNumber'
       },
       {
-        text: this.$t('category.list.headers.status'),
+        text: t('category.list.headers.status'),
         value: 'status',
         sortable: false
       },
       {
-        text: this.$t('category.list.headers.actions'),
+        text: t('category.list.headers.actions'),
         value: 'id',
         sortable: false
       }
-    ];
+    ]);
+
+    return {
+      t,
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters,
+      headers
+    };
   }
-}
+});
 </script>
 
 <style lang="scss"></style>
diff --git a/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/components/MultiListFilters.vue b/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/components/MultiListFilters.vue
index fc765eb..a6fedaf 100644
--- a/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/components/MultiListFilters.vue
+++ b/generators/testdata/expected/vt-template/all/src/pages/Entity/Category/components/MultiListFilters.vue
@@ -1,26 +1,43 @@
 <template>
-  <vt-multi-filter
+  <vt-new-multi-filter
     :items="filterItems"
     :filters="filters"
     autofocus
-    :label="$t('common.list.filter.title')"
+    :label="t('common.list.filter.title')"
     @submitFilters="$emit('submitFilters')"
+    @update:filters="$emit('update:filters', $event)"
   />
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityListFilters from '@/common/Entity/EntityListFilters';
+import { IFilterItem } from '@/common/MultiFilter/types';
+import { useI18n } from '@/composables/useI18n';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class MultiListFilters extends EntityListFilters {
-  filterItems = [
+export default defineComponent({
+  name: 'MultiListFilters',
+
+  props: {
+    filters: {
+      type: Object,
+      required: true
+    },
+    activeFilters: {
+      type: Object,
+      required: true
+    }
+  },
+
+  emits: ['submitFilters', 'update:filters'],
+
+  setup () {
+    const { t } = useI18n();
+
+    const filterItems = [
     {
       id: 'title',
       type: 'input',
-      title: this.$t('category.list.filter.title'),
+      title: t('category.list.filter.title'),
       value: null,
       values: null,
       settings: {
@@ -31,7 +48,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'orderNumber',
       type: 'input',
-      title: this.$t('category.list.filter.orderNumber'),
+      title: t('category.list.filter.orderNumber'),
       value: null,
       values: null,
       settings: {
@@ -43,7 +60,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'statusId',
       type: 'select',
-      title: this.$t('category.list.filter.statusId'),
+      title: t('category.list.filter.statusId'),
       value: null,
       values: null,
       settings: {
@@ -59,7 +76,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'ids',
       type: 'select',
-      title: this.$t('category.list.filter.ids'),
+      title: t('category.list.filter.ids'),
       value: null,
       values: null,
       settings: {
@@ -69,6 +86,12 @@ export default class MultiListFilters extends EntityListFilters {
         component: 'v-text-field'
       }
     }
-  ].filter(Boolean)
-}
+  ].filter(Boolean) as IFilterItem[];
+
+    return {
+      t,
+      filterItems
+    };
+  }
+});
 </script>
diff --git a/generators/testdata/expected/vt-template/all/src/pages/Entity/News/Form.vue b/generators/testdata/expected/vt-template/all/src/pages/Entity/News/Form.vue
index 3892583..ff0c74e 100644
--- a/generators/testdata/expected/vt-template/all/src/pages/Entity/News/Form.vue
+++ b/generators/testdata/expected/vt-template/all/src/pages/Entity/News/Form.vue
@@ -15,7 +15,7 @@
         >
           <v-flex>
             <h2 class="ellipsed">
-              {{ store.model.title || "..." }}
+              {{ model.title || "..." }}
             </h2>
           </v-flex>
           <v-spacer />
@@ -23,7 +23,7 @@
             <v-btn
               text
               color="primary"
-              :disabled="store.isLoading"
+              :disabled="isLoading"
               @click.stop="navigateBack"
             >
               <v-icon
@@ -32,7 +32,7 @@
                 arrow_back
               </v-icon>
               <template v-if="!$vuetify.breakpoint.xsOnly">
-                {{ $t("common.form.cancelButtonLabel") }}
+                {{ t("common.form.cancelButtonLabel") }}
               </template>
             </v-btn>
             <v-hover
@@ -61,7 +61,7 @@
             Основные
           </v-tab>
         </v-tabs>
-        <v-card v-if="store.model">
+        <v-card v-if="model">
           <v-form
             ref="form"
             @submit.prevent="onSaveAndBack"
@@ -71,102 +71,102 @@
                 <v-tab-item eager>
                   <!--  generated part -->
                   <vt-form-field
-                    v-model="store.model.title"
+                    v-model="model.title"
                     component="v-text-field"
-                    :label="$t('news.form.titleLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.title))"
-                    :disabled="store.isLoading"
+                    :label="t('news.form.titleLabel')"
+                    :error-messages="getErrorMessage(errors.title)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                   /><vt-form-field
-                    v-model="store.model.preview"
+                    v-model="model.preview"
                     component="v-text-field"
-                    :label="$t('news.form.previewLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.preview))"
-                    :disabled="store.isLoading"
+                    :label="t('news.form.previewLabel')"
+                    :error-messages="getErrorMessage(errors.preview)"
+                    :disabled="isLoading"
                     placeholder=""
                     clearable
                   /><vt-form-field
-                    v-model="store.model.content"
+                    v-model="model.content"
                     component="vt-tinymce-editor"
-                    :label="$t('news.form.contentLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.content))"
-                    :disabled="store.isLoading"
+                    :label="t('news.form.contentLabel')"
+                    :error-messages="getErrorMessage(errors.content)"
+                    :disabled="isLoading"
                     placeholder=""
                     clearable
                     without-help
                   /><vt-form-field
-                    v-model="store.model.categoryId"
+                    v-model="model.categoryId"
                     entity="category"
                     search-by="title"
                     prefetch
                     component="vt-entity-autocomplete"
-                    :label="$t('news.form.categoryIdLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.categoryId))"
-                    :disabled="store.isLoading"
+                    :label="t('news.form.categoryIdLabel')"
+                    :error-messages="getErrorMessage(errors.categoryId)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                   /><vt-form-field
-                    v-model="store.model.countryId"
+                    v-model="model.countryId"
                     entity="country"
                     search-by="title"
                     prefetch
                     component="vt-entity-autocomplete"
-                    :label="$t('news.form.countryIdLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.countryId))"
-                    :disabled="store.isLoading"
+                    :label="t('news.form.countryIdLabel')"
+                    :error-messages="getErrorMessage(errors.countryId)"
+                    :disabled="isLoading"
                     placeholder=""
                     clearable
                   /><vt-form-field
-                    v-model="store.model.regionId"
+                    v-model="model.regionId"
                     entity="region"
                     search-by="title"
                     prefetch
                     component="vt-entity-autocomplete"
-                    :label="$t('news.form.regionIdLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.regionId))"
-                    :disabled="store.isLoading"
+                    :label="t('news.form.regionIdLabel')"
+                    :error-messages="getErrorMessage(errors.regionId)"
+                    :disabled="isLoading"
                     placeholder=""
                     clearable
                   /><vt-form-field
-                    v-model="store.model.cityId"
+                    v-model="model.cityId"
                     entity="city"
                     search-by="title"
                     prefetch
                     component="vt-entity-autocomplete"
-                    :label="$t('news.form.cityIdLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.cityId))"
-                    :disabled="store.isLoading"
+                    :label="t('news.form.cityIdLabel')"
+                    :error-messages="getErrorMessage(errors.cityId)"
+                    :disabled="isLoading"
                     placeholder=""
                     clearable
                   /><vt-form-field
-                    v-model="store.model.tagIds"
+                    v-model="model.tagIds"
                     entity="tag"
                     search-by="title"
                     prefetch
                     component="vt-entity-autocomplete"
-                    :label="$t('news.form.tagIdsLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.tagIds))"
-                    :disabled="store.isLoading"
+                    :label="t('news.form.tagIdsLabel')"
+                    :error-messages="getErrorMessage(errors.tagIds)"
+                    :disabled="isLoading"
                     placeholder=""
                     clearable
                     multiple
                     chips
                   /><vt-form-field
-                    v-model="store.model.publishedAt"
+                    v-model="model.publishedAt"
                     component="vt-datetime-picker"
-                    :label="$t('news.form.publishedAtLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.publishedAt))"
-                    :disabled="store.isLoading"
+                    :label="t('news.form.publishedAtLabel')"
+                    :error-messages="getErrorMessage(errors.publishedAt)"
+                    :disabled="isLoading"
                     placeholder=""
                     clearable
                     iso
                   /><vt-form-field
-                    v-model="store.model.statusId"
+                    v-model="model.statusId"
                     component="vt-status-select"
-                    :label="$t('news.form.statusIdLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.statusId))"
-                    :disabled="store.isLoading"
+                    :label="t('news.form.statusIdLabel')"
+                    :error-messages="getErrorMessage(errors.statusId)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                     compact
@@ -186,21 +186,21 @@
                     <v-btn
                       type="submit"
                       color="success"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="!$vuetify.breakpoint.xsOnly && 'mx-2'"
                     >
                       <v-icon left>
                         done
                       </v-icon>
-                      {{ $t("common.form.saveAndCloseButtonLabel") }}
+                      {{ t("common.form.saveAndCloseButtonLabel") }}
                     </v-btn>
 
                     <v-btn
                       v-if="$route.params.id"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="[
                         $vuetify.breakpoint.xsOnly && 'ml-0 mt-2',
@@ -210,7 +210,7 @@
                       color="accent"
                       @click.stop="onSave"
                     >
-                      {{ $t("common.form.saveButtonLabel") }}
+                      {{ t("common.form.saveButtonLabel") }}
                     </v-btn>
                     <v-spacer />
                   </v-layout>
@@ -225,17 +225,58 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
+import { useEntityForm } from '@/composables/useEntityForm';
+import { useI18n } from '@/composables/useI18n'
 import { News as Model } from '@/services/api/factory';
-import Store from '@/common/Entity/EntityModelStore';
-import EntityForm from '@/common/Entity/EntityForm';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class Form extends EntityForm {
-  store: Store<Model> = new Store<Model>(Model);
-}
+export default defineComponent({
+  // eslint-disable-next-line vue/match-component-file-name
+  name: 'NewsForm',
+
+  setup () {
+    const { t } = useI18n();
+
+    const {
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    } = useEntityForm<Model>({ Model} );
+
+	const getErrorMessage = (errorKey: string | null): string => {
+      const errorMessage = i18nFieldError(errorKey);
+      return errorMessage ? t(errorMessage) : '';
+    };
+
+    return {
+      t,
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+      getErrorMessage,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    };
+  }
+});
 </script>
 
 <style scoped></style>
diff --git a/generators/testdata/expected/vt-template/all/src/pages/Entity/News/List.vue b/generators/testdata/expected/vt-template/all/src/pages/Entity/News/List.vue
index 8cc4aa6..c9dc873 100644
--- a/generators/testdata/expected/vt-template/all/src/pages/Entity/News/List.vue
+++ b/generators/testdata/expected/vt-template/all/src/pages/Entity/News/List.vue
@@ -18,27 +18,26 @@
               <v-flex>
                 <v-layout align-center>
                   <h2 class="ellipsed mr-1">
-                    {{ $t("news.list.title") }}
+                    {{ t("news.list.title") }}
                   </h2>
                   <span
-                    v-if="store.pagination.totalItems"
+                    v-if="pagination.totalItems"
                     class="text--secondary subtitle-2"
                   >
-                    {{ store.pagination.totalItems }}
+                    {{ pagination.totalItems }}
                   </span>
                 </v-layout>
               </v-flex>
               <v-spacer />
               <v-flex shrink>
                 <v-btn
+                  small
                   dark
                   color="success"
                   :to="{ name: 'newsAdd' }"
                 >
-                  <v-icon left>
-                    add
-                  </v-icon>
-                  {{ $t("common.list.addNewLabel") }}
+                  <v-icon>add</v-icon>
+                  {{ t("common.list.addNewLabel") }}
                 </v-btn>
               </v-flex>
             </v-layout>
@@ -64,9 +63,9 @@
                     mr-sm-2
                   >
                     <v-text-field
-                      v-model="store.filters.title"
+                      v-model="filters.title"
                       :placeholder="
-                        $t('news.list.filter.quickFilterPlaceholder')
+                        t('news.list.filter.quickFilterPlaceholder')
                       "
                       hide-details
                       @keyup.enter.native="submitFilters()"
@@ -78,9 +77,10 @@
                     mr-sm-10
                   >
                     <multi-filters
-                      :filters="store.filters"
-                      :active-filters="store.activeFilters"
+                      :filters="filters"
+                      :active-filters="activeFilters"
                       @submitFilters="submitFilters"
+                      @update:filters="updateFilters"
                     />
                   </v-flex>
                   <v-flex
@@ -88,8 +88,8 @@
                     mt-sm-4
                   >
                     <vt-compact-pagination
-                      :value="store.pagination.page"
-                      :total-pages="store.pagination.totalPages"
+                      :value="pagination.page"
+                      :total-pages="pagination.totalPages"
                       @input="setCompactPagination"
                     />
                   </v-flex>
@@ -100,9 +100,9 @@
               <v-data-table
                 v-model="selected"
                 :headers="headers"
-                :items="store.list"
-                :options="store.vuetifyTableOptions"
-                :server-items-length="store.pagination.totalItems"
+                :items="list"
+                :options="vuetifyTableOptions"
+                :server-items-length="pagination.totalItems"
                 item-key="id"
                 :footer-props="{
                   itemsPerPageOptions: [10, 25, 50, 100, 500]
@@ -116,7 +116,7 @@
                   }
                 ]"
                 :show-select="false"
-                :loading="store.isLoading"
+                :loading="isLoading"
                 fixed-header
                 @update:options="setPagination"
               >
@@ -176,67 +176,95 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityList from '@/common/Entity/EntityList';
-import Store from '@/common/Entity/EntityCollectionStore';
-import {
-  NewsSummary as Model,
-  NewsSearch as SearchModel
-} from '@/services/api/factory';
+import { computed, defineComponent } from 'vue';
+import { NewsSummary, NewsSearch } from '@/services/api/factory';
+import { useEntityList } from '@/composables/useEntityList';
+import { useI18n } from '@/composables/useI18n';
+
 import MultiFilters from './components/MultiListFilters.vue';
 
-@Observer
-@Component({
+export default defineComponent({
+  // eslint-disable-next-line vue/multi-word-component-names
   name: 'List',
-  components: { MultiFilters }
-})
-export default class List extends EntityList {
-  store: Store = new Store(Model, SearchModel);
+  components: { MultiFilters },
+
+  setup () {
+    const { t } = useI18n();
 
-  get headers () {
-    return [
+    const {
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters
+    } = useEntityList(NewsSummary, NewsSearch);
+
+    const headers = computed(() => [
       {
-        text: this.$t('news.list.headers.title'),
+        text: t('news.list.headers.title'),
         value: 'title',
         align: 'left'
       },
       {
-        text: this.$t('news.list.headers.preview'),
+        text: t('news.list.headers.preview'),
         value: 'preview'
       },
       {
-        text: this.$t('news.list.headers.content'),
+        text: t('news.list.headers.content'),
         value: 'content'
       },
       {
-        text: this.$t('news.list.headers.category'),
+        text: t('news.list.headers.category'),
         value: 'category',
         sortable: false
       },
       {
-        text: this.$t('news.list.headers.country'),
+        text: t('news.list.headers.country'),
         value: 'country',
         sortable: false
       },
       {
-        text: this.$t('news.list.headers.region'),
+        text: t('news.list.headers.region'),
         value: 'region',
         sortable: false
       },
       {
-        text: this.$t('news.list.headers.status'),
+        text: t('news.list.headers.status'),
         value: 'status',
         sortable: false
       },
       {
-        text: this.$t('news.list.headers.actions'),
+        text: t('news.list.headers.actions'),
         value: 'id',
         sortable: false
       }
-    ];
+    ]);
+
+    return {
+      t,
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters,
+      headers
+    };
   }
-}
+});
 </script>
 
 <style lang="scss"></style>
diff --git a/generators/testdata/expected/vt-template/all/src/pages/Entity/News/components/MultiListFilters.vue b/generators/testdata/expected/vt-template/all/src/pages/Entity/News/components/MultiListFilters.vue
index 83bb31e..7f1ec20 100644
--- a/generators/testdata/expected/vt-template/all/src/pages/Entity/News/components/MultiListFilters.vue
+++ b/generators/testdata/expected/vt-template/all/src/pages/Entity/News/components/MultiListFilters.vue
@@ -1,26 +1,43 @@
 <template>
-  <vt-multi-filter
+  <vt-new-multi-filter
     :items="filterItems"
     :filters="filters"
     autofocus
-    :label="$t('common.list.filter.title')"
+    :label="t('common.list.filter.title')"
     @submitFilters="$emit('submitFilters')"
+    @update:filters="$emit('update:filters', $event)"
   />
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityListFilters from '@/common/Entity/EntityListFilters';
+import { IFilterItem } from '@/common/MultiFilter/types';
+import { useI18n } from '@/composables/useI18n';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class MultiListFilters extends EntityListFilters {
-  filterItems = [
+export default defineComponent({
+  name: 'MultiListFilters',
+
+  props: {
+    filters: {
+      type: Object,
+      required: true
+    },
+    activeFilters: {
+      type: Object,
+      required: true
+    }
+  },
+
+  emits: ['submitFilters', 'update:filters'],
+
+  setup () {
+    const { t } = useI18n();
+
+    const filterItems = [
     {
       id: 'title',
       type: 'input',
-      title: this.$t('news.list.filter.title'),
+      title: t('news.list.filter.title'),
       value: null,
       values: null,
       settings: {
@@ -31,7 +48,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'preview',
       type: 'input',
-      title: this.$t('news.list.filter.preview'),
+      title: t('news.list.filter.preview'),
       value: null,
       values: null,
       settings: {
@@ -42,7 +59,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'content',
       type: 'input',
-      title: this.$t('news.list.filter.content'),
+      title: t('news.list.filter.content'),
       value: null,
       values: null,
       settings: {
@@ -53,7 +70,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'categoryId',
       type: 'select',
-      title: this.$t('news.list.filter.categoryId'),
+      title: t('news.list.filter.categoryId'),
       value: null,
       values: null,
       settings: {
@@ -67,7 +84,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'countryId',
       type: 'select',
-      title: this.$t('news.list.filter.countryId'),
+      title: t('news.list.filter.countryId'),
       value: null,
       values: null,
       settings: {
@@ -81,7 +98,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'regionId',
       type: 'select',
-      title: this.$t('news.list.filter.regionId'),
+      title: t('news.list.filter.regionId'),
       value: null,
       values: null,
       settings: {
@@ -95,7 +112,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'cityId',
       type: 'select',
-      title: this.$t('news.list.filter.cityId'),
+      title: t('news.list.filter.cityId'),
       value: null,
       values: null,
       settings: {
@@ -109,7 +126,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'createdAt',
       type: 'datetime',
-      title: this.$t('news.list.filter.createdAt'),
+      title: t('news.list.filter.createdAt'),
       value: null,
       values: null,
       settings: {
@@ -121,7 +138,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'publishedAt',
       type: 'datetime',
-      title: this.$t('news.list.filter.publishedAt'),
+      title: t('news.list.filter.publishedAt'),
       value: null,
       values: null,
       settings: {
@@ -133,7 +150,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'statusId',
       type: 'select',
-      title: this.$t('news.list.filter.statusId'),
+      title: t('news.list.filter.statusId'),
       value: null,
       values: null,
       settings: {
@@ -149,7 +166,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'ids',
       type: 'select',
-      title: this.$t('news.list.filter.ids'),
+      title: t('news.list.filter.ids'),
       value: null,
       values: null,
       settings: {
@@ -159,6 +176,12 @@ export default class MultiListFilters extends EntityListFilters {
         component: 'v-text-field'
       }
     }
-  ].filter(Boolean)
-}
+  ].filter(Boolean) as IFilterItem[];
+
+    return {
+      t,
+      filterItems
+    };
+  }
+});
 </script>
diff --git a/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/Form.vue b/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/Form.vue
index e46587a..6630576 100644
--- a/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/Form.vue
+++ b/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/Form.vue
@@ -15,7 +15,7 @@
         >
           <v-flex>
             <h2 class="ellipsed">
-              {{ store.model.title || "..." }}
+              {{ model.title || "..." }}
             </h2>
           </v-flex>
           <v-spacer />
@@ -23,7 +23,7 @@
             <v-btn
               text
               color="primary"
-              :disabled="store.isLoading"
+              :disabled="isLoading"
               @click.stop="navigateBack"
             >
               <v-icon
@@ -32,7 +32,7 @@
                 arrow_back
               </v-icon>
               <template v-if="!$vuetify.breakpoint.xsOnly">
-                {{ $t("common.form.cancelButtonLabel") }}
+                {{ t("common.form.cancelButtonLabel") }}
               </template>
             </v-btn>
             <v-hover
@@ -61,7 +61,7 @@
             Основные
           </v-tab>
         </v-tabs>
-        <v-card v-if="store.model">
+        <v-card v-if="model">
           <v-form
             ref="form"
             @submit.prevent="onSaveAndBack"
@@ -71,19 +71,19 @@
                 <v-tab-item eager>
                   <!--  generated part -->
                   <vt-form-field
-                    v-model="store.model.title"
+                    v-model="model.title"
                     component="v-text-field"
-                    :label="$t('tag.form.titleLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.title))"
-                    :disabled="store.isLoading"
+                    :label="t('tag.form.titleLabel')"
+                    :error-messages="getErrorMessage(errors.title)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                   /><vt-form-field
-                    v-model="store.model.statusId"
+                    v-model="model.statusId"
                     component="vt-status-select"
-                    :label="$t('tag.form.statusIdLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.statusId))"
-                    :disabled="store.isLoading"
+                    :label="t('tag.form.statusIdLabel')"
+                    :error-messages="getErrorMessage(errors.statusId)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                     compact
@@ -103,21 +103,21 @@
                     <v-btn
                       type="submit"
                       color="success"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="!$vuetify.breakpoint.xsOnly && 'mx-2'"
                     >
                       <v-icon left>
                         done
                       </v-icon>
-                      {{ $t("common.form.saveAndCloseButtonLabel") }}
+                      {{ t("common.form.saveAndCloseButtonLabel") }}
                     </v-btn>
 
                     <v-btn
                       v-if="$route.params.id"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="[
                         $vuetify.breakpoint.xsOnly && 'ml-0 mt-2',
@@ -127,7 +127,7 @@
                       color="accent"
                       @click.stop="onSave"
                     >
-                      {{ $t("common.form.saveButtonLabel") }}
+                      {{ t("common.form.saveButtonLabel") }}
                     </v-btn>
                     <v-spacer />
                   </v-layout>
@@ -142,17 +142,58 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
+import { useEntityForm } from '@/composables/useEntityForm';
+import { useI18n } from '@/composables/useI18n'
 import { Tag as Model } from '@/services/api/factory';
-import Store from '@/common/Entity/EntityModelStore';
-import EntityForm from '@/common/Entity/EntityForm';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class Form extends EntityForm {
-  store: Store<Model> = new Store<Model>(Model);
-}
+export default defineComponent({
+  // eslint-disable-next-line vue/match-component-file-name
+  name: 'TagForm',
+
+  setup () {
+    const { t } = useI18n();
+
+    const {
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    } = useEntityForm<Model>({ Model} );
+
+	const getErrorMessage = (errorKey: string | null): string => {
+      const errorMessage = i18nFieldError(errorKey);
+      return errorMessage ? t(errorMessage) : '';
+    };
+
+    return {
+      t,
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+      getErrorMessage,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    };
+  }
+});
 </script>
 
 <style scoped></style>
diff --git a/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/List.vue b/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/List.vue
index 59f5d65..71dec4b 100644
--- a/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/List.vue
+++ b/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/List.vue
@@ -18,27 +18,26 @@
               <v-flex>
                 <v-layout align-center>
                   <h2 class="ellipsed mr-1">
-                    {{ $t("tag.list.title") }}
+                    {{ t("tag.list.title") }}
                   </h2>
                   <span
-                    v-if="store.pagination.totalItems"
+                    v-if="pagination.totalItems"
                     class="text--secondary subtitle-2"
                   >
-                    {{ store.pagination.totalItems }}
+                    {{ pagination.totalItems }}
                   </span>
                 </v-layout>
               </v-flex>
               <v-spacer />
               <v-flex shrink>
                 <v-btn
+                  small
                   dark
                   color="success"
                   :to="{ name: 'tagAdd' }"
                 >
-                  <v-icon left>
-                    add
-                  </v-icon>
-                  {{ $t("common.list.addNewLabel") }}
+                  <v-icon>add</v-icon>
+                  {{ t("common.list.addNewLabel") }}
                 </v-btn>
               </v-flex>
             </v-layout>
@@ -64,9 +63,9 @@
                     mr-sm-2
                   >
                     <v-text-field
-                      v-model="store.filters.title"
+                      v-model="filters.title"
                       :placeholder="
-                        $t('tag.list.filter.quickFilterPlaceholder')
+                        t('tag.list.filter.quickFilterPlaceholder')
                       "
                       hide-details
                       @keyup.enter.native="submitFilters()"
@@ -78,9 +77,10 @@
                     mr-sm-10
                   >
                     <multi-filters
-                      :filters="store.filters"
-                      :active-filters="store.activeFilters"
+                      :filters="filters"
+                      :active-filters="activeFilters"
                       @submitFilters="submitFilters"
+                      @update:filters="updateFilters"
                     />
                   </v-flex>
                   <v-flex
@@ -88,8 +88,8 @@
                     mt-sm-4
                   >
                     <vt-compact-pagination
-                      :value="store.pagination.page"
-                      :total-pages="store.pagination.totalPages"
+                      :value="pagination.page"
+                      :total-pages="pagination.totalPages"
                       @input="setCompactPagination"
                     />
                   </v-flex>
@@ -100,9 +100,9 @@
               <v-data-table
                 v-model="selected"
                 :headers="headers"
-                :items="store.list"
-                :options="store.vuetifyTableOptions"
-                :server-items-length="store.pagination.totalItems"
+                :items="list"
+                :options="vuetifyTableOptions"
+                :server-items-length="pagination.totalItems"
                 item-key="id"
                 :footer-props="{
                   itemsPerPageOptions: [10, 25, 50, 100, 500]
@@ -116,7 +116,7 @@
                   }
                 ]"
                 :show-select="false"
-                :loading="store.isLoading"
+                :loading="isLoading"
                 fixed-header
                 @update:options="setPagination"
               >
@@ -161,44 +161,72 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityList from '@/common/Entity/EntityList';
-import Store from '@/common/Entity/EntityCollectionStore';
-import {
-  TagSummary as Model,
-  TagSearch as SearchModel
-} from '@/services/api/factory';
+import { computed, defineComponent } from 'vue';
+import { TagSummary, TagSearch } from '@/services/api/factory';
+import { useEntityList } from '@/composables/useEntityList';
+import { useI18n } from '@/composables/useI18n';
+
 import MultiFilters from './components/MultiListFilters.vue';
 
-@Observer
-@Component({
+export default defineComponent({
+  // eslint-disable-next-line vue/multi-word-component-names
   name: 'List',
-  components: { MultiFilters }
-})
-export default class List extends EntityList {
-  store: Store = new Store(Model, SearchModel);
+  components: { MultiFilters },
+
+  setup () {
+    const { t } = useI18n();
 
-  get headers () {
-    return [
+    const {
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters
+    } = useEntityList(TagSummary, TagSearch);
+
+    const headers = computed(() => [
       {
-        text: this.$t('tag.list.headers.title'),
+        text: t('tag.list.headers.title'),
         value: 'title',
         align: 'left'
       },
       {
-        text: this.$t('tag.list.headers.status'),
+        text: t('tag.list.headers.status'),
         value: 'status',
         sortable: false
       },
       {
-        text: this.$t('tag.list.headers.actions'),
+        text: t('tag.list.headers.actions'),
         value: 'id',
         sortable: false
       }
-    ];
+    ]);
+
+    return {
+      t,
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters,
+      headers
+    };
   }
-}
+});
 </script>
 
 <style lang="scss"></style>
diff --git a/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/components/MultiListFilters.vue b/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/components/MultiListFilters.vue
index 4e5ae81..523e594 100644
--- a/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/components/MultiListFilters.vue
+++ b/generators/testdata/expected/vt-template/all/src/pages/Entity/Tag/components/MultiListFilters.vue
@@ -1,26 +1,43 @@
 <template>
-  <vt-multi-filter
+  <vt-new-multi-filter
     :items="filterItems"
     :filters="filters"
     autofocus
-    :label="$t('common.list.filter.title')"
+    :label="t('common.list.filter.title')"
     @submitFilters="$emit('submitFilters')"
+    @update:filters="$emit('update:filters', $event)"
   />
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityListFilters from '@/common/Entity/EntityListFilters';
+import { IFilterItem } from '@/common/MultiFilter/types';
+import { useI18n } from '@/composables/useI18n';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class MultiListFilters extends EntityListFilters {
-  filterItems = [
+export default defineComponent({
+  name: 'MultiListFilters',
+
+  props: {
+    filters: {
+      type: Object,
+      required: true
+    },
+    activeFilters: {
+      type: Object,
+      required: true
+    }
+  },
+
+  emits: ['submitFilters', 'update:filters'],
+
+  setup () {
+    const { t } = useI18n();
+
+    const filterItems = [
     {
       id: 'title',
       type: 'input',
-      title: this.$t('tag.list.filter.title'),
+      title: t('tag.list.filter.title'),
       value: null,
       values: null,
       settings: {
@@ -31,7 +48,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'statusId',
       type: 'select',
-      title: this.$t('tag.list.filter.statusId'),
+      title: t('tag.list.filter.statusId'),
       value: null,
       values: null,
       settings: {
@@ -47,7 +64,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'ids',
       type: 'select',
-      title: this.$t('tag.list.filter.ids'),
+      title: t('tag.list.filter.ids'),
       value: null,
       values: null,
       settings: {
@@ -57,6 +74,12 @@ export default class MultiListFilters extends EntityListFilters {
         component: 'v-text-field'
       }
     }
-  ].filter(Boolean)
-}
+  ].filter(Boolean) as IFilterItem[];
+
+    return {
+      t,
+      filterItems
+    };
+  }
+});
 </script>
diff --git a/generators/testdata/expected/vt-template/all/src/pages/Entity/routes.ts b/generators/testdata/expected/vt-template/all/src/pages/Entity/routes.ts
index 7c69d18..198b28f 100644
--- a/generators/testdata/expected/vt-template/all/src/pages/Entity/routes.ts
+++ b/generators/testdata/expected/vt-template/all/src/pages/Entity/routes.ts
@@ -1,311 +1,344 @@
 /* eslint-disable */
 export default [
-  /* Category */
-  {
-    name: "categoryList",
-    path: "/categories",
-    component: () =>
-      import("@/pages/Entity/Category/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "categoryList"]
-    }
-  },
-  {
-    name: "categoryEdit",
-    path: "/categories/:id/edit",
-    component: () =>
-      import("@/pages/Entity/Category/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "categoryList", "categoryEdit"]
-    }
-  },
-  {
-    name: "categoryAdd",
-    path: "/categories/add",
-    component: () =>
-      import("@/pages/Entity/Category/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "categoryList", "categoryAdd"]
-    }
-  },
-  /* News */
-  {
-    name: "newsList",
-    path: "/news",
-    component: () =>
-      import("@/pages/Entity/News/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "newsList"]
-    }
-  },
-  {
-    name: "newsEdit",
-    path: "/news/:id/edit",
-    component: () =>
-      import("@/pages/Entity/News/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "newsList", "newsEdit"]
-    }
-  },
-  {
-    name: "newsAdd",
-    path: "/news/add",
-    component: () =>
-      import("@/pages/Entity/News/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "newsList", "newsAdd"]
-    }
-  },
-  /* Tag */
-  {
-    name: "tagList",
-    path: "/tags",
-    component: () =>
-      import("@/pages/Entity/Tag/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "tagList"]
-    }
-  },
-  {
-    name: "tagEdit",
-    path: "/tags/:id/edit",
-    component: () =>
-      import("@/pages/Entity/Tag/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "tagList", "tagEdit"]
-    }
-  },
-  {
-    name: "tagAdd",
-    path: "/tags/add",
-    component: () =>
-      import("@/pages/Entity/Tag/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "tagList", "tagAdd"]
-    }
-  },
-  /* City */
-  {
-    name: "cityList",
-    path: "/cities",
-    component: () =>
-      import("@/pages/Entity/City/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "cityList"]
-    }
-  },
-  {
-    name: "cityEdit",
-    path: "/cities/:id/edit",
-    component: () =>
-      import("@/pages/Entity/City/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "cityList", "cityEdit"]
-    }
-  },
-  {
-    name: "cityAdd",
-    path: "/cities/add",
-    component: () =>
-      import("@/pages/Entity/City/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "cityList", "cityAdd"]
-    }
-  },
-  /* Country */
-  {
-    name: "countryList",
-    path: "/countries",
-    component: () =>
-      import("@/pages/Entity/Country/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "countryList"]
-    }
-  },
-  {
-    name: "countryEdit",
-    path: "/countries/:id/edit",
-    component: () =>
-      import("@/pages/Entity/Country/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "countryList", "countryEdit"]
-    }
-  },
-  {
-    name: "countryAdd",
-    path: "/countries/add",
-    component: () =>
-      import("@/pages/Entity/Country/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "countryList", "countryAdd"]
-    }
-  },
-  /* Region */
-  {
-    name: "regionList",
-    path: "/regions",
-    component: () =>
-      import("@/pages/Entity/Region/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "regionList"]
-    }
-  },
-  {
-    name: "regionEdit",
-    path: "/regions/:id/edit",
-    component: () =>
-      import("@/pages/Entity/Region/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "regionList", "regionEdit"]
-    }
-  },
-  {
-    name: "regionAdd",
-    path: "/regions/add",
-    component: () =>
-      import("@/pages/Entity/Region/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "regionList", "regionAdd"]
-    }
-  },
-  /* EncryptionKey */
-  {
-    name: "encryptionKeyList",
-    path: "/encryption-keys",
-    component: () =>
-      import("@/pages/Entity/EncryptionKey/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "encryptionKeyList"]
-    }
-  },
-  {
-    name: "encryptionKeyEdit",
-    path: "/encryption-keys/:id/edit",
-    component: () =>
-      import("@/pages/Entity/EncryptionKey/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "encryptionKeyList", "encryptionKeyEdit"]
-    }
-  },
-  {
-    name: "encryptionKeyAdd",
-    path: "/encryption-keys/add",
-    component: () =>
-      import("@/pages/Entity/EncryptionKey/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "encryptionKeyList", "encryptionKeyAdd"]
-    }
-  },
-  /* LoginCode */
-  {
-    name: "loginCodeList",
-    path: "/login-codes",
-    component: () =>
-      import("@/pages/Entity/LoginCode/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "loginCodeList"]
-    }
-  },
-  {
-    name: "loginCodeEdit",
-    path: "/login-codes/:id/edit",
-    component: () =>
-      import("@/pages/Entity/LoginCode/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "loginCodeList", "loginCodeEdit"]
-    }
-  },
-  {
-    name: "loginCodeAdd",
-    path: "/login-codes/add",
-    component: () =>
-      import("@/pages/Entity/LoginCode/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "loginCodeList", "loginCodeAdd"]
-    }
-  },
-  /* SiteUser */
-  {
-    name: "siteUserList",
-    path: "/site-users",
-    component: () =>
-      import("@/pages/Entity/SiteUser/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "siteUserList"]
-    }
-  },
-  {
-    name: "siteUserEdit",
-    path: "/site-users/:id/edit",
-    component: () =>
-      import("@/pages/Entity/SiteUser/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "siteUserList", "siteUserEdit"]
-    }
-  },
-  {
-    name: "siteUserAdd",
-    path: "/site-users/add",
-    component: () =>
-      import("@/pages/Entity/SiteUser/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "siteUserList", "siteUserAdd"]
-    }
-  },
-  /* VfsFile */
-  {
-    name: "vfsFileList",
-    path: "/vfs-files",
-    component: () =>
-      import("@/pages/Entity/VfsFile/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFileList"]
-    }
-  },
-  {
-    name: "vfsFileEdit",
-    path: "/vfs-files/:id/edit",
-    component: () =>
-      import("@/pages/Entity/VfsFile/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFileList", "vfsFileEdit"]
-    }
-  },
-  {
-    name: "vfsFileAdd",
-    path: "/vfs-files/add",
-    component: () =>
-      import("@/pages/Entity/VfsFile/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFileList", "vfsFileAdd"]
-    }
-  },
-  /* VfsFolder */
-  {
-    name: "vfsFolderList",
-    path: "/vfs-folders",
-    component: () =>
-      import("@/pages/Entity/VfsFolder/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFolderList"]
-    }
-  },
-  {
-    name: "vfsFolderEdit",
-    path: "/vfs-folders/:id/edit",
-    component: () =>
-      import("@/pages/Entity/VfsFolder/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFolderList", "vfsFolderEdit"]
-    }
-  },
-  {
-    name: "vfsFolderAdd",
-    path: "/vfs-folders/add",
-    component: () =>
-      import("@/pages/Entity/VfsFolder/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFolderList", "vfsFolderAdd"]
-    }
-  },
+    /* Category */
+    {
+        name: "categoryList",
+        path: "/categories",
+        component: () =>
+            import("@/pages/Entity/Category/List.vue"),
+        meta: {
+            title: "CategoryList",
+            breadcrumbs: ["dashboard", "categoryList"]
+        }
+    },
+    {
+        name: "categoryEdit",
+        path: "/categories/:id/edit",
+        component: () =>
+            import("@/pages/Entity/Category/Form.vue"),
+        meta: {
+            title: "CategoryEdit",
+            breadcrumbs: ["dashboard", "categoryList", "categoryEdit"]
+        }
+    },
+    {
+        name: "categoryAdd",
+        path: "/categories/add",
+        component: () =>
+            import("@/pages/Entity/Category/Form.vue"),
+        meta: {
+            title: "CategoryAdd",
+            breadcrumbs: ["dashboard", "categoryList", "categoryAdd"]
+        }
+    },
+    /* News */
+    {
+        name: "newsList",
+        path: "/news",
+        component: () =>
+            import("@/pages/Entity/News/List.vue"),
+        meta: {
+            title: "NewsList",
+            breadcrumbs: ["dashboard", "newsList"]
+        }
+    },
+    {
+        name: "newsEdit",
+        path: "/news/:id/edit",
+        component: () =>
+            import("@/pages/Entity/News/Form.vue"),
+        meta: {
+            title: "NewsEdit",
+            breadcrumbs: ["dashboard", "newsList", "newsEdit"]
+        }
+    },
+    {
+        name: "newsAdd",
+        path: "/news/add",
+        component: () =>
+            import("@/pages/Entity/News/Form.vue"),
+        meta: {
+            title: "NewsAdd",
+            breadcrumbs: ["dashboard", "newsList", "newsAdd"]
+        }
+    },
+    /* Tag */
+    {
+        name: "tagList",
+        path: "/tags",
+        component: () =>
+            import("@/pages/Entity/Tag/List.vue"),
+        meta: {
+            title: "TagList",
+            breadcrumbs: ["dashboard", "tagList"]
+        }
+    },
+    {
+        name: "tagEdit",
+        path: "/tags/:id/edit",
+        component: () =>
+            import("@/pages/Entity/Tag/Form.vue"),
+        meta: {
+            title: "TagEdit",
+            breadcrumbs: ["dashboard", "tagList", "tagEdit"]
+        }
+    },
+    {
+        name: "tagAdd",
+        path: "/tags/add",
+        component: () =>
+            import("@/pages/Entity/Tag/Form.vue"),
+        meta: {
+            title: "TagAdd",
+            breadcrumbs: ["dashboard", "tagList", "tagAdd"]
+        }
+    },
+    /* City */
+    {
+        name: "cityList",
+        path: "/cities",
+        component: () =>
+            import("@/pages/Entity/City/List.vue"),
+        meta: {
+            title: "CityList",
+            breadcrumbs: ["dashboard", "cityList"]
+        }
+    },
+    {
+        name: "cityEdit",
+        path: "/cities/:id/edit",
+        component: () =>
+            import("@/pages/Entity/City/Form.vue"),
+        meta: {
+            title: "CityEdit",
+            breadcrumbs: ["dashboard", "cityList", "cityEdit"]
+        }
+    },
+    {
+        name: "cityAdd",
+        path: "/cities/add",
+        component: () =>
+            import("@/pages/Entity/City/Form.vue"),
+        meta: {
+            title: "CityAdd",
+            breadcrumbs: ["dashboard", "cityList", "cityAdd"]
+        }
+    },
+    /* Country */
+    {
+        name: "countryList",
+        path: "/countries",
+        component: () =>
+            import("@/pages/Entity/Country/List.vue"),
+        meta: {
+            title: "CountryList",
+            breadcrumbs: ["dashboard", "countryList"]
+        }
+    },
+    {
+        name: "countryEdit",
+        path: "/countries/:id/edit",
+        component: () =>
+            import("@/pages/Entity/Country/Form.vue"),
+        meta: {
+            title: "CountryEdit",
+            breadcrumbs: ["dashboard", "countryList", "countryEdit"]
+        }
+    },
+    {
+        name: "countryAdd",
+        path: "/countries/add",
+        component: () =>
+            import("@/pages/Entity/Country/Form.vue"),
+        meta: {
+            title: "CountryAdd",
+            breadcrumbs: ["dashboard", "countryList", "countryAdd"]
+        }
+    },
+    /* Region */
+    {
+        name: "regionList",
+        path: "/regions",
+        component: () =>
+            import("@/pages/Entity/Region/List.vue"),
+        meta: {
+            title: "RegionList",
+            breadcrumbs: ["dashboard", "regionList"]
+        }
+    },
+    {
+        name: "regionEdit",
+        path: "/regions/:id/edit",
+        component: () =>
+            import("@/pages/Entity/Region/Form.vue"),
+        meta: {
+            title: "RegionEdit",
+            breadcrumbs: ["dashboard", "regionList", "regionEdit"]
+        }
+    },
+    {
+        name: "regionAdd",
+        path: "/regions/add",
+        component: () =>
+            import("@/pages/Entity/Region/Form.vue"),
+        meta: {
+            title: "RegionAdd",
+            breadcrumbs: ["dashboard", "regionList", "regionAdd"]
+        }
+    },
+    /* EncryptionKey */
+    {
+        name: "encryptionKeyList",
+        path: "/encryption-keys",
+        component: () =>
+            import("@/pages/Entity/EncryptionKey/List.vue"),
+        meta: {
+            title: "EncryptionKeyList",
+            breadcrumbs: ["dashboard", "encryptionKeyList"]
+        }
+    },
+    {
+        name: "encryptionKeyEdit",
+        path: "/encryption-keys/:id/edit",
+        component: () =>
+            import("@/pages/Entity/EncryptionKey/Form.vue"),
+        meta: {
+            title: "EncryptionKeyEdit",
+            breadcrumbs: ["dashboard", "encryptionKeyList", "encryptionKeyEdit"]
+        }
+    },
+    {
+        name: "encryptionKeyAdd",
+        path: "/encryption-keys/add",
+        component: () =>
+            import("@/pages/Entity/EncryptionKey/Form.vue"),
+        meta: {
+            title: "EncryptionKeyAdd",
+            breadcrumbs: ["dashboard", "encryptionKeyList", "encryptionKeyAdd"]
+        }
+    },
+    /* LoginCode */
+    {
+        name: "loginCodeList",
+        path: "/login-codes",
+        component: () =>
+            import("@/pages/Entity/LoginCode/List.vue"),
+        meta: {
+            title: "LoginCodeList",
+            breadcrumbs: ["dashboard", "loginCodeList"]
+        }
+    },
+    {
+        name: "loginCodeEdit",
+        path: "/login-codes/:id/edit",
+        component: () =>
+            import("@/pages/Entity/LoginCode/Form.vue"),
+        meta: {
+            title: "LoginCodeEdit",
+            breadcrumbs: ["dashboard", "loginCodeList", "loginCodeEdit"]
+        }
+    },
+    {
+        name: "loginCodeAdd",
+        path: "/login-codes/add",
+        component: () =>
+            import("@/pages/Entity/LoginCode/Form.vue"),
+        meta: {
+            title: "LoginCodeAdd",
+            breadcrumbs: ["dashboard", "loginCodeList", "loginCodeAdd"]
+        }
+    },
+    /* SiteUser */
+    {
+        name: "siteUserList",
+        path: "/site-users",
+        component: () =>
+            import("@/pages/Entity/SiteUser/List.vue"),
+        meta: {
+            title: "SiteUserList",
+            breadcrumbs: ["dashboard", "siteUserList"]
+        }
+    },
+    {
+        name: "siteUserEdit",
+        path: "/site-users/:id/edit",
+        component: () =>
+            import("@/pages/Entity/SiteUser/Form.vue"),
+        meta: {
+            title: "SiteUserEdit",
+            breadcrumbs: ["dashboard", "siteUserList", "siteUserEdit"]
+        }
+    },
+    {
+        name: "siteUserAdd",
+        path: "/site-users/add",
+        component: () =>
+            import("@/pages/Entity/SiteUser/Form.vue"),
+        meta: {
+            title: "SiteUserAdd",
+            breadcrumbs: ["dashboard", "siteUserList", "siteUserAdd"]
+        }
+    },
+    /* VfsFile */
+    {
+        name: "vfsFileList",
+        path: "/vfs-files",
+        component: () =>
+            import("@/pages/Entity/VfsFile/List.vue"),
+        meta: {
+            title: "VfsFileList",
+            breadcrumbs: ["dashboard", "vfsFileList"]
+        }
+    },
+    {
+        name: "vfsFileEdit",
+        path: "/vfs-files/:id/edit",
+        component: () =>
+            import("@/pages/Entity/VfsFile/Form.vue"),
+        meta: {
+            title: "VfsFileEdit",
+            breadcrumbs: ["dashboard", "vfsFileList", "vfsFileEdit"]
+        }
+    },
+    {
+        name: "vfsFileAdd",
+        path: "/vfs-files/add",
+        component: () =>
+            import("@/pages/Entity/VfsFile/Form.vue"),
+        meta: {
+            title: "VfsFileAdd",
+            breadcrumbs: ["dashboard", "vfsFileList", "vfsFileAdd"]
+        }
+    },
+    /* VfsFolder */
+    {
+        name: "vfsFolderList",
+        path: "/vfs-folders",
+        component: () =>
+            import("@/pages/Entity/VfsFolder/List.vue"),
+        meta: {
+            title: "VfsFolderList",
+            breadcrumbs: ["dashboard", "vfsFolderList"]
+        }
+    },
+    {
+        name: "vfsFolderEdit",
+        path: "/vfs-folders/:id/edit",
+        component: () =>
+            import("@/pages/Entity/VfsFolder/Form.vue"),
+        meta: {
+            title: "VfsFolderEdit",
+            breadcrumbs: ["dashboard", "vfsFolderList", "vfsFolderEdit"]
+        }
+    },
+    {
+        name: "vfsFolderAdd",
+        path: "/vfs-folders/add",
+        component: () =>
+            import("@/pages/Entity/VfsFolder/Form.vue"),
+        meta: {
+            title: "VfsFolderAdd",
+            breadcrumbs: ["dashboard", "vfsFolderList", "vfsFolderAdd"]
+        }
+    },
 ];
diff --git a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/Form.vue b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/Form.vue
index 49ec139..ab8d2d8 100644
--- a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/Form.vue
+++ b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/Form.vue
@@ -15,7 +15,7 @@
         >
           <v-flex>
             <h2 class="ellipsed">
-              {{ store.model.title || "..." }}
+              {{ model.title || "..." }}
             </h2>
           </v-flex>
           <v-spacer />
@@ -23,7 +23,7 @@
             <v-btn
               text
               color="primary"
-              :disabled="store.isLoading"
+              :disabled="isLoading"
               @click.stop="navigateBack"
             >
               <v-icon
@@ -32,7 +32,7 @@
                 arrow_back
               </v-icon>
               <template v-if="!$vuetify.breakpoint.xsOnly">
-                {{ $t("common.form.cancelButtonLabel") }}
+                {{ t("common.form.cancelButtonLabel") }}
               </template>
             </v-btn>
             <v-hover
@@ -61,7 +61,7 @@
             Основные
           </v-tab>
         </v-tabs>
-        <v-card v-if="store.model">
+        <v-card v-if="model">
           <v-form
             ref="form"
             @submit.prevent="onSaveAndBack"
@@ -71,27 +71,27 @@
                 <v-tab-item eager>
                   <!--  generated part -->
                   <vt-form-field
-                    v-model="store.model.title"
+                    v-model="model.title"
                     component="v-text-field"
-                    :label="$t('category.form.titleLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.title))"
-                    :disabled="store.isLoading"
+                    :label="t('category.form.titleLabel')"
+                    :error-messages="getErrorMessage(errors.title)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                   /><vt-form-field
-                    v-model="store.model.orderNumber"
+                    v-model="model.orderNumber"
                     component="v-text-field"
-                    :label="$t('category.form.orderNumberLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.orderNumber))"
-                    :disabled="store.isLoading"
+                    :label="t('category.form.orderNumberLabel')"
+                    :error-messages="getErrorMessage(errors.orderNumber)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                   /><vt-form-field
-                    v-model="store.model.statusId"
+                    v-model="model.statusId"
                     component="vt-status-select"
-                    :label="$t('category.form.statusIdLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.statusId))"
-                    :disabled="store.isLoading"
+                    :label="t('category.form.statusIdLabel')"
+                    :error-messages="getErrorMessage(errors.statusId)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                     compact
@@ -111,21 +111,21 @@
                     <v-btn
                       type="submit"
                       color="success"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="!$vuetify.breakpoint.xsOnly && 'mx-2'"
                     >
                       <v-icon left>
                         done
                       </v-icon>
-                      {{ $t("common.form.saveAndCloseButtonLabel") }}
+                      {{ t("common.form.saveAndCloseButtonLabel") }}
                     </v-btn>
 
                     <v-btn
                       v-if="$route.params.id"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="[
                         $vuetify.breakpoint.xsOnly && 'ml-0 mt-2',
@@ -135,7 +135,7 @@
                       color="accent"
                       @click.stop="onSave"
                     >
-                      {{ $t("common.form.saveButtonLabel") }}
+                      {{ t("common.form.saveButtonLabel") }}
                     </v-btn>
                     <v-spacer />
                   </v-layout>
@@ -150,17 +150,58 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
+import { useEntityForm } from '@/composables/useEntityForm';
+import { useI18n } from '@/composables/useI18n'
 import { Category as Model } from '@/services/api/factory';
-import Store from '@/common/Entity/EntityModelStore';
-import EntityForm from '@/common/Entity/EntityForm';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class Form extends EntityForm {
-  store: Store<Model> = new Store<Model>(Model);
-}
+export default defineComponent({
+  // eslint-disable-next-line vue/match-component-file-name
+  name: 'CategoryForm',
+
+  setup () {
+    const { t } = useI18n();
+
+    const {
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    } = useEntityForm<Model>({ Model} );
+
+	const getErrorMessage = (errorKey: string | null): string => {
+      const errorMessage = i18nFieldError(errorKey);
+      return errorMessage ? t(errorMessage) : '';
+    };
+
+    return {
+      t,
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+      getErrorMessage,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    };
+  }
+});
 </script>
 
 <style scoped></style>
diff --git a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/List.vue b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/List.vue
index f2e6d2a..261806a 100644
--- a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/List.vue
+++ b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/List.vue
@@ -18,27 +18,26 @@
               <v-flex>
                 <v-layout align-center>
                   <h2 class="ellipsed mr-1">
-                    {{ $t("category.list.title") }}
+                    {{ t("category.list.title") }}
                   </h2>
                   <span
-                    v-if="store.pagination.totalItems"
+                    v-if="pagination.totalItems"
                     class="text--secondary subtitle-2"
                   >
-                    {{ store.pagination.totalItems }}
+                    {{ pagination.totalItems }}
                   </span>
                 </v-layout>
               </v-flex>
               <v-spacer />
               <v-flex shrink>
                 <v-btn
+                  small
                   dark
                   color="success"
                   :to="{ name: 'categoryAdd' }"
                 >
-                  <v-icon left>
-                    add
-                  </v-icon>
-                  {{ $t("common.list.addNewLabel") }}
+                  <v-icon>add</v-icon>
+                  {{ t("common.list.addNewLabel") }}
                 </v-btn>
               </v-flex>
             </v-layout>
@@ -64,9 +63,9 @@
                     mr-sm-2
                   >
                     <v-text-field
-                      v-model="store.filters.title"
+                      v-model="filters.title"
                       :placeholder="
-                        $t('category.list.filter.quickFilterPlaceholder')
+                        t('category.list.filter.quickFilterPlaceholder')
                       "
                       hide-details
                       @keyup.enter.native="submitFilters()"
@@ -78,9 +77,10 @@
                     mr-sm-10
                   >
                     <multi-filters
-                      :filters="store.filters"
-                      :active-filters="store.activeFilters"
+                      :filters="filters"
+                      :active-filters="activeFilters"
                       @submitFilters="submitFilters"
+                      @update:filters="updateFilters"
                     />
                   </v-flex>
                   <v-flex
@@ -88,8 +88,8 @@
                     mt-sm-4
                   >
                     <vt-compact-pagination
-                      :value="store.pagination.page"
-                      :total-pages="store.pagination.totalPages"
+                      :value="pagination.page"
+                      :total-pages="pagination.totalPages"
                       @input="setCompactPagination"
                     />
                   </v-flex>
@@ -100,9 +100,9 @@
               <v-data-table
                 v-model="selected"
                 :headers="headers"
-                :items="store.list"
-                :options="store.vuetifyTableOptions"
-                :server-items-length="store.pagination.totalItems"
+                :items="list"
+                :options="vuetifyTableOptions"
+                :server-items-length="pagination.totalItems"
                 item-key="id"
                 :footer-props="{
                   itemsPerPageOptions: [10, 25, 50, 100, 500]
@@ -116,7 +116,7 @@
                   }
                 ]"
                 :show-select="false"
-                :loading="store.isLoading"
+                :loading="isLoading"
                 fixed-header
                 @update:options="setPagination"
               >
@@ -164,48 +164,76 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityList from '@/common/Entity/EntityList';
-import Store from '@/common/Entity/EntityCollectionStore';
-import {
-  CategorySummary as Model,
-  CategorySearch as SearchModel
-} from '@/services/api/factory';
+import { computed, defineComponent } from 'vue';
+import { CategorySummary, CategorySearch } from '@/services/api/factory';
+import { useEntityList } from '@/composables/useEntityList';
+import { useI18n } from '@/composables/useI18n';
+
 import MultiFilters from './components/MultiListFilters.vue';
 
-@Observer
-@Component({
+export default defineComponent({
+  // eslint-disable-next-line vue/multi-word-component-names
   name: 'List',
-  components: { MultiFilters }
-})
-export default class List extends EntityList {
-  store: Store = new Store(Model, SearchModel);
+  components: { MultiFilters },
+
+  setup () {
+    const { t } = useI18n();
 
-  get headers () {
-    return [
+    const {
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters
+    } = useEntityList(CategorySummary, CategorySearch);
+
+    const headers = computed(() => [
       {
-        text: this.$t('category.list.headers.title'),
+        text: t('category.list.headers.title'),
         value: 'title',
         align: 'left'
       },
       {
-        text: this.$t('category.list.headers.orderNumber'),
+        text: t('category.list.headers.orderNumber'),
         value: 'orderNumber'
       },
       {
-        text: this.$t('category.list.headers.status'),
+        text: t('category.list.headers.status'),
         value: 'status',
         sortable: false
       },
       {
-        text: this.$t('category.list.headers.actions'),
+        text: t('category.list.headers.actions'),
         value: 'id',
         sortable: false
       }
-    ];
+    ]);
+
+    return {
+      t,
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters,
+      headers
+    };
   }
-}
+});
 </script>
 
 <style lang="scss"></style>
diff --git a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/components/MultiListFilters.vue b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/components/MultiListFilters.vue
index fc765eb..a6fedaf 100644
--- a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/components/MultiListFilters.vue
+++ b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Category/components/MultiListFilters.vue
@@ -1,26 +1,43 @@
 <template>
-  <vt-multi-filter
+  <vt-new-multi-filter
     :items="filterItems"
     :filters="filters"
     autofocus
-    :label="$t('common.list.filter.title')"
+    :label="t('common.list.filter.title')"
     @submitFilters="$emit('submitFilters')"
+    @update:filters="$emit('update:filters', $event)"
   />
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityListFilters from '@/common/Entity/EntityListFilters';
+import { IFilterItem } from '@/common/MultiFilter/types';
+import { useI18n } from '@/composables/useI18n';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class MultiListFilters extends EntityListFilters {
-  filterItems = [
+export default defineComponent({
+  name: 'MultiListFilters',
+
+  props: {
+    filters: {
+      type: Object,
+      required: true
+    },
+    activeFilters: {
+      type: Object,
+      required: true
+    }
+  },
+
+  emits: ['submitFilters', 'update:filters'],
+
+  setup () {
+    const { t } = useI18n();
+
+    const filterItems = [
     {
       id: 'title',
       type: 'input',
-      title: this.$t('category.list.filter.title'),
+      title: t('category.list.filter.title'),
       value: null,
       values: null,
       settings: {
@@ -31,7 +48,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'orderNumber',
       type: 'input',
-      title: this.$t('category.list.filter.orderNumber'),
+      title: t('category.list.filter.orderNumber'),
       value: null,
       values: null,
       settings: {
@@ -43,7 +60,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'statusId',
       type: 'select',
-      title: this.$t('category.list.filter.statusId'),
+      title: t('category.list.filter.statusId'),
       value: null,
       values: null,
       settings: {
@@ -59,7 +76,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'ids',
       type: 'select',
-      title: this.$t('category.list.filter.ids'),
+      title: t('category.list.filter.ids'),
       value: null,
       values: null,
       settings: {
@@ -69,6 +86,12 @@ export default class MultiListFilters extends EntityListFilters {
         component: 'v-text-field'
       }
     }
-  ].filter(Boolean)
-}
+  ].filter(Boolean) as IFilterItem[];
+
+    return {
+      t,
+      filterItems
+    };
+  }
+});
 </script>
diff --git a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/Form.vue b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/Form.vue
index e46587a..6630576 100644
--- a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/Form.vue
+++ b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/Form.vue
@@ -15,7 +15,7 @@
         >
           <v-flex>
             <h2 class="ellipsed">
-              {{ store.model.title || "..." }}
+              {{ model.title || "..." }}
             </h2>
           </v-flex>
           <v-spacer />
@@ -23,7 +23,7 @@
             <v-btn
               text
               color="primary"
-              :disabled="store.isLoading"
+              :disabled="isLoading"
               @click.stop="navigateBack"
             >
               <v-icon
@@ -32,7 +32,7 @@
                 arrow_back
               </v-icon>
               <template v-if="!$vuetify.breakpoint.xsOnly">
-                {{ $t("common.form.cancelButtonLabel") }}
+                {{ t("common.form.cancelButtonLabel") }}
               </template>
             </v-btn>
             <v-hover
@@ -61,7 +61,7 @@
             Основные
           </v-tab>
         </v-tabs>
-        <v-card v-if="store.model">
+        <v-card v-if="model">
           <v-form
             ref="form"
             @submit.prevent="onSaveAndBack"
@@ -71,19 +71,19 @@
                 <v-tab-item eager>
                   <!--  generated part -->
                   <vt-form-field
-                    v-model="store.model.title"
+                    v-model="model.title"
                     component="v-text-field"
-                    :label="$t('tag.form.titleLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.title))"
-                    :disabled="store.isLoading"
+                    :label="t('tag.form.titleLabel')"
+                    :error-messages="getErrorMessage(errors.title)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                   /><vt-form-field
-                    v-model="store.model.statusId"
+                    v-model="model.statusId"
                     component="vt-status-select"
-                    :label="$t('tag.form.statusIdLabel')"
-                    :error-messages="$t(i18nFieldError(store.errors.statusId))"
-                    :disabled="store.isLoading"
+                    :label="t('tag.form.statusIdLabel')"
+                    :error-messages="getErrorMessage(errors.statusId)"
+                    :disabled="isLoading"
                     placeholder=""
                     required
                     compact
@@ -103,21 +103,21 @@
                     <v-btn
                       type="submit"
                       color="success"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="!$vuetify.breakpoint.xsOnly && 'mx-2'"
                     >
                       <v-icon left>
                         done
                       </v-icon>
-                      {{ $t("common.form.saveAndCloseButtonLabel") }}
+                      {{ t("common.form.saveAndCloseButtonLabel") }}
                     </v-btn>
 
                     <v-btn
                       v-if="$route.params.id"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="[
                         $vuetify.breakpoint.xsOnly && 'ml-0 mt-2',
@@ -127,7 +127,7 @@
                       color="accent"
                       @click.stop="onSave"
                     >
-                      {{ $t("common.form.saveButtonLabel") }}
+                      {{ t("common.form.saveButtonLabel") }}
                     </v-btn>
                     <v-spacer />
                   </v-layout>
@@ -142,17 +142,58 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
+import { useEntityForm } from '@/composables/useEntityForm';
+import { useI18n } from '@/composables/useI18n'
 import { Tag as Model } from '@/services/api/factory';
-import Store from '@/common/Entity/EntityModelStore';
-import EntityForm from '@/common/Entity/EntityForm';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class Form extends EntityForm {
-  store: Store<Model> = new Store<Model>(Model);
-}
+export default defineComponent({
+  // eslint-disable-next-line vue/match-component-file-name
+  name: 'TagForm',
+
+  setup () {
+    const { t } = useI18n();
+
+    const {
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    } = useEntityForm<Model>({ Model} );
+
+	const getErrorMessage = (errorKey: string | null): string => {
+      const errorMessage = i18nFieldError(errorKey);
+      return errorMessage ? t(errorMessage) : '';
+    };
+
+    return {
+      t,
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+      getErrorMessage,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    };
+  }
+});
 </script>
 
 <style scoped></style>
diff --git a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/List.vue b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/List.vue
index 59f5d65..71dec4b 100644
--- a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/List.vue
+++ b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/List.vue
@@ -18,27 +18,26 @@
               <v-flex>
                 <v-layout align-center>
                   <h2 class="ellipsed mr-1">
-                    {{ $t("tag.list.title") }}
+                    {{ t("tag.list.title") }}
                   </h2>
                   <span
-                    v-if="store.pagination.totalItems"
+                    v-if="pagination.totalItems"
                     class="text--secondary subtitle-2"
                   >
-                    {{ store.pagination.totalItems }}
+                    {{ pagination.totalItems }}
                   </span>
                 </v-layout>
               </v-flex>
               <v-spacer />
               <v-flex shrink>
                 <v-btn
+                  small
                   dark
                   color="success"
                   :to="{ name: 'tagAdd' }"
                 >
-                  <v-icon left>
-                    add
-                  </v-icon>
-                  {{ $t("common.list.addNewLabel") }}
+                  <v-icon>add</v-icon>
+                  {{ t("common.list.addNewLabel") }}
                 </v-btn>
               </v-flex>
             </v-layout>
@@ -64,9 +63,9 @@
                     mr-sm-2
                   >
                     <v-text-field
-                      v-model="store.filters.title"
+                      v-model="filters.title"
                       :placeholder="
-                        $t('tag.list.filter.quickFilterPlaceholder')
+                        t('tag.list.filter.quickFilterPlaceholder')
                       "
                       hide-details
                       @keyup.enter.native="submitFilters()"
@@ -78,9 +77,10 @@
                     mr-sm-10
                   >
                     <multi-filters
-                      :filters="store.filters"
-                      :active-filters="store.activeFilters"
+                      :filters="filters"
+                      :active-filters="activeFilters"
                       @submitFilters="submitFilters"
+                      @update:filters="updateFilters"
                     />
                   </v-flex>
                   <v-flex
@@ -88,8 +88,8 @@
                     mt-sm-4
                   >
                     <vt-compact-pagination
-                      :value="store.pagination.page"
-                      :total-pages="store.pagination.totalPages"
+                      :value="pagination.page"
+                      :total-pages="pagination.totalPages"
                       @input="setCompactPagination"
                     />
                   </v-flex>
@@ -100,9 +100,9 @@
               <v-data-table
                 v-model="selected"
                 :headers="headers"
-                :items="store.list"
-                :options="store.vuetifyTableOptions"
-                :server-items-length="store.pagination.totalItems"
+                :items="list"
+                :options="vuetifyTableOptions"
+                :server-items-length="pagination.totalItems"
                 item-key="id"
                 :footer-props="{
                   itemsPerPageOptions: [10, 25, 50, 100, 500]
@@ -116,7 +116,7 @@
                   }
                 ]"
                 :show-select="false"
-                :loading="store.isLoading"
+                :loading="isLoading"
                 fixed-header
                 @update:options="setPagination"
               >
@@ -161,44 +161,72 @@
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityList from '@/common/Entity/EntityList';
-import Store from '@/common/Entity/EntityCollectionStore';
-import {
-  TagSummary as Model,
-  TagSearch as SearchModel
-} from '@/services/api/factory';
+import { computed, defineComponent } from 'vue';
+import { TagSummary, TagSearch } from '@/services/api/factory';
+import { useEntityList } from '@/composables/useEntityList';
+import { useI18n } from '@/composables/useI18n';
+
 import MultiFilters from './components/MultiListFilters.vue';
 
-@Observer
-@Component({
+export default defineComponent({
+  // eslint-disable-next-line vue/multi-word-component-names
   name: 'List',
-  components: { MultiFilters }
-})
-export default class List extends EntityList {
-  store: Store = new Store(Model, SearchModel);
+  components: { MultiFilters },
+
+  setup () {
+    const { t } = useI18n();
 
-  get headers () {
-    return [
+    const {
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters
+    } = useEntityList(TagSummary, TagSearch);
+
+    const headers = computed(() => [
       {
-        text: this.$t('tag.list.headers.title'),
+        text: t('tag.list.headers.title'),
         value: 'title',
         align: 'left'
       },
       {
-        text: this.$t('tag.list.headers.status'),
+        text: t('tag.list.headers.status'),
         value: 'status',
         sortable: false
       },
       {
-        text: this.$t('tag.list.headers.actions'),
+        text: t('tag.list.headers.actions'),
         value: 'id',
         sortable: false
       }
-    ];
+    ]);
+
+    return {
+      t,
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters,
+      headers
+    };
   }
-}
+});
 </script>
 
 <style lang="scss"></style>
diff --git a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/components/MultiListFilters.vue b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/components/MultiListFilters.vue
index 4e5ae81..523e594 100644
--- a/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/components/MultiListFilters.vue
+++ b/generators/testdata/expected/vt-template/entities/src/pages/Entity/Tag/components/MultiListFilters.vue
@@ -1,26 +1,43 @@
 <template>
-  <vt-multi-filter
+  <vt-new-multi-filter
     :items="filterItems"
     :filters="filters"
     autofocus
-    :label="$t('common.list.filter.title')"
+    :label="t('common.list.filter.title')"
     @submitFilters="$emit('submitFilters')"
+    @update:filters="$emit('update:filters', $event)"
   />
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityListFilters from '@/common/Entity/EntityListFilters';
+import { IFilterItem } from '@/common/MultiFilter/types';
+import { useI18n } from '@/composables/useI18n';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class MultiListFilters extends EntityListFilters {
-  filterItems = [
+export default defineComponent({
+  name: 'MultiListFilters',
+
+  props: {
+    filters: {
+      type: Object,
+      required: true
+    },
+    activeFilters: {
+      type: Object,
+      required: true
+    }
+  },
+
+  emits: ['submitFilters', 'update:filters'],
+
+  setup () {
+    const { t } = useI18n();
+
+    const filterItems = [
     {
       id: 'title',
       type: 'input',
-      title: this.$t('tag.list.filter.title'),
+      title: t('tag.list.filter.title'),
       value: null,
       values: null,
       settings: {
@@ -31,7 +48,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'statusId',
       type: 'select',
-      title: this.$t('tag.list.filter.statusId'),
+      title: t('tag.list.filter.statusId'),
       value: null,
       values: null,
       settings: {
@@ -47,7 +64,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: 'ids',
       type: 'select',
-      title: this.$t('tag.list.filter.ids'),
+      title: t('tag.list.filter.ids'),
       value: null,
       values: null,
       settings: {
@@ -57,6 +74,12 @@ export default class MultiListFilters extends EntityListFilters {
         component: 'v-text-field'
       }
     }
-  ].filter(Boolean)
-}
+  ].filter(Boolean) as IFilterItem[];
+
+    return {
+      t,
+      filterItems
+    };
+  }
+});
 </script>
diff --git a/generators/testdata/expected/vt-template/entities/src/pages/Entity/routes.ts b/generators/testdata/expected/vt-template/entities/src/pages/Entity/routes.ts
index 7c69d18..198b28f 100644
--- a/generators/testdata/expected/vt-template/entities/src/pages/Entity/routes.ts
+++ b/generators/testdata/expected/vt-template/entities/src/pages/Entity/routes.ts
@@ -1,311 +1,344 @@
 /* eslint-disable */
 export default [
-  /* Category */
-  {
-    name: "categoryList",
-    path: "/categories",
-    component: () =>
-      import("@/pages/Entity/Category/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "categoryList"]
-    }
-  },
-  {
-    name: "categoryEdit",
-    path: "/categories/:id/edit",
-    component: () =>
-      import("@/pages/Entity/Category/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "categoryList", "categoryEdit"]
-    }
-  },
-  {
-    name: "categoryAdd",
-    path: "/categories/add",
-    component: () =>
-      import("@/pages/Entity/Category/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "categoryList", "categoryAdd"]
-    }
-  },
-  /* News */
-  {
-    name: "newsList",
-    path: "/news",
-    component: () =>
-      import("@/pages/Entity/News/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "newsList"]
-    }
-  },
-  {
-    name: "newsEdit",
-    path: "/news/:id/edit",
-    component: () =>
-      import("@/pages/Entity/News/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "newsList", "newsEdit"]
-    }
-  },
-  {
-    name: "newsAdd",
-    path: "/news/add",
-    component: () =>
-      import("@/pages/Entity/News/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "newsList", "newsAdd"]
-    }
-  },
-  /* Tag */
-  {
-    name: "tagList",
-    path: "/tags",
-    component: () =>
-      import("@/pages/Entity/Tag/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "tagList"]
-    }
-  },
-  {
-    name: "tagEdit",
-    path: "/tags/:id/edit",
-    component: () =>
-      import("@/pages/Entity/Tag/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "tagList", "tagEdit"]
-    }
-  },
-  {
-    name: "tagAdd",
-    path: "/tags/add",
-    component: () =>
-      import("@/pages/Entity/Tag/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "tagList", "tagAdd"]
-    }
-  },
-  /* City */
-  {
-    name: "cityList",
-    path: "/cities",
-    component: () =>
-      import("@/pages/Entity/City/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "cityList"]
-    }
-  },
-  {
-    name: "cityEdit",
-    path: "/cities/:id/edit",
-    component: () =>
-      import("@/pages/Entity/City/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "cityList", "cityEdit"]
-    }
-  },
-  {
-    name: "cityAdd",
-    path: "/cities/add",
-    component: () =>
-      import("@/pages/Entity/City/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "cityList", "cityAdd"]
-    }
-  },
-  /* Country */
-  {
-    name: "countryList",
-    path: "/countries",
-    component: () =>
-      import("@/pages/Entity/Country/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "countryList"]
-    }
-  },
-  {
-    name: "countryEdit",
-    path: "/countries/:id/edit",
-    component: () =>
-      import("@/pages/Entity/Country/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "countryList", "countryEdit"]
-    }
-  },
-  {
-    name: "countryAdd",
-    path: "/countries/add",
-    component: () =>
-      import("@/pages/Entity/Country/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "countryList", "countryAdd"]
-    }
-  },
-  /* Region */
-  {
-    name: "regionList",
-    path: "/regions",
-    component: () =>
-      import("@/pages/Entity/Region/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "regionList"]
-    }
-  },
-  {
-    name: "regionEdit",
-    path: "/regions/:id/edit",
-    component: () =>
-      import("@/pages/Entity/Region/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "regionList", "regionEdit"]
-    }
-  },
-  {
-    name: "regionAdd",
-    path: "/regions/add",
-    component: () =>
-      import("@/pages/Entity/Region/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "regionList", "regionAdd"]
-    }
-  },
-  /* EncryptionKey */
-  {
-    name: "encryptionKeyList",
-    path: "/encryption-keys",
-    component: () =>
-      import("@/pages/Entity/EncryptionKey/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "encryptionKeyList"]
-    }
-  },
-  {
-    name: "encryptionKeyEdit",
-    path: "/encryption-keys/:id/edit",
-    component: () =>
-      import("@/pages/Entity/EncryptionKey/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "encryptionKeyList", "encryptionKeyEdit"]
-    }
-  },
-  {
-    name: "encryptionKeyAdd",
-    path: "/encryption-keys/add",
-    component: () =>
-      import("@/pages/Entity/EncryptionKey/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "encryptionKeyList", "encryptionKeyAdd"]
-    }
-  },
-  /* LoginCode */
-  {
-    name: "loginCodeList",
-    path: "/login-codes",
-    component: () =>
-      import("@/pages/Entity/LoginCode/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "loginCodeList"]
-    }
-  },
-  {
-    name: "loginCodeEdit",
-    path: "/login-codes/:id/edit",
-    component: () =>
-      import("@/pages/Entity/LoginCode/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "loginCodeList", "loginCodeEdit"]
-    }
-  },
-  {
-    name: "loginCodeAdd",
-    path: "/login-codes/add",
-    component: () =>
-      import("@/pages/Entity/LoginCode/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "loginCodeList", "loginCodeAdd"]
-    }
-  },
-  /* SiteUser */
-  {
-    name: "siteUserList",
-    path: "/site-users",
-    component: () =>
-      import("@/pages/Entity/SiteUser/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "siteUserList"]
-    }
-  },
-  {
-    name: "siteUserEdit",
-    path: "/site-users/:id/edit",
-    component: () =>
-      import("@/pages/Entity/SiteUser/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "siteUserList", "siteUserEdit"]
-    }
-  },
-  {
-    name: "siteUserAdd",
-    path: "/site-users/add",
-    component: () =>
-      import("@/pages/Entity/SiteUser/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "siteUserList", "siteUserAdd"]
-    }
-  },
-  /* VfsFile */
-  {
-    name: "vfsFileList",
-    path: "/vfs-files",
-    component: () =>
-      import("@/pages/Entity/VfsFile/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFileList"]
-    }
-  },
-  {
-    name: "vfsFileEdit",
-    path: "/vfs-files/:id/edit",
-    component: () =>
-      import("@/pages/Entity/VfsFile/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFileList", "vfsFileEdit"]
-    }
-  },
-  {
-    name: "vfsFileAdd",
-    path: "/vfs-files/add",
-    component: () =>
-      import("@/pages/Entity/VfsFile/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFileList", "vfsFileAdd"]
-    }
-  },
-  /* VfsFolder */
-  {
-    name: "vfsFolderList",
-    path: "/vfs-folders",
-    component: () =>
-      import("@/pages/Entity/VfsFolder/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFolderList"]
-    }
-  },
-  {
-    name: "vfsFolderEdit",
-    path: "/vfs-folders/:id/edit",
-    component: () =>
-      import("@/pages/Entity/VfsFolder/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFolderList", "vfsFolderEdit"]
-    }
-  },
-  {
-    name: "vfsFolderAdd",
-    path: "/vfs-folders/add",
-    component: () =>
-      import("@/pages/Entity/VfsFolder/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "vfsFolderList", "vfsFolderAdd"]
-    }
-  },
+    /* Category */
+    {
+        name: "categoryList",
+        path: "/categories",
+        component: () =>
+            import("@/pages/Entity/Category/List.vue"),
+        meta: {
+            title: "CategoryList",
+            breadcrumbs: ["dashboard", "categoryList"]
+        }
+    },
+    {
+        name: "categoryEdit",
+        path: "/categories/:id/edit",
+        component: () =>
+            import("@/pages/Entity/Category/Form.vue"),
+        meta: {
+            title: "CategoryEdit",
+            breadcrumbs: ["dashboard", "categoryList", "categoryEdit"]
+        }
+    },
+    {
+        name: "categoryAdd",
+        path: "/categories/add",
+        component: () =>
+            import("@/pages/Entity/Category/Form.vue"),
+        meta: {
+            title: "CategoryAdd",
+            breadcrumbs: ["dashboard", "categoryList", "categoryAdd"]
+        }
+    },
+    /* News */
+    {
+        name: "newsList",
+        path: "/news",
+        component: () =>
+            import("@/pages/Entity/News/List.vue"),
+        meta: {
+            title: "NewsList",
+            breadcrumbs: ["dashboard", "newsList"]
+        }
+    },
+    {
+        name: "newsEdit",
+        path: "/news/:id/edit",
+        component: () =>
+            import("@/pages/Entity/News/Form.vue"),
+        meta: {
+            title: "NewsEdit",
+            breadcrumbs: ["dashboard", "newsList", "newsEdit"]
+        }
+    },
+    {
+        name: "newsAdd",
+        path: "/news/add",
+        component: () =>
+            import("@/pages/Entity/News/Form.vue"),
+        meta: {
+            title: "NewsAdd",
+            breadcrumbs: ["dashboard", "newsList", "newsAdd"]
+        }
+    },
+    /* Tag */
+    {
+        name: "tagList",
+        path: "/tags",
+        component: () =>
+            import("@/pages/Entity/Tag/List.vue"),
+        meta: {
+            title: "TagList",
+            breadcrumbs: ["dashboard", "tagList"]
+        }
+    },
+    {
+        name: "tagEdit",
+        path: "/tags/:id/edit",
+        component: () =>
+            import("@/pages/Entity/Tag/Form.vue"),
+        meta: {
+            title: "TagEdit",
+            breadcrumbs: ["dashboard", "tagList", "tagEdit"]
+        }
+    },
+    {
+        name: "tagAdd",
+        path: "/tags/add",
+        component: () =>
+            import("@/pages/Entity/Tag/Form.vue"),
+        meta: {
+            title: "TagAdd",
+            breadcrumbs: ["dashboard", "tagList", "tagAdd"]
+        }
+    },
+    /* City */
+    {
+        name: "cityList",
+        path: "/cities",
+        component: () =>
+            import("@/pages/Entity/City/List.vue"),
+        meta: {
+            title: "CityList",
+            breadcrumbs: ["dashboard", "cityList"]
+        }
+    },
+    {
+        name: "cityEdit",
+        path: "/cities/:id/edit",
+        component: () =>
+            import("@/pages/Entity/City/Form.vue"),
+        meta: {
+            title: "CityEdit",
+            breadcrumbs: ["dashboard", "cityList", "cityEdit"]
+        }
+    },
+    {
+        name: "cityAdd",
+        path: "/cities/add",
+        component: () =>
+            import("@/pages/Entity/City/Form.vue"),
+        meta: {
+            title: "CityAdd",
+            breadcrumbs: ["dashboard", "cityList", "cityAdd"]
+        }
+    },
+    /* Country */
+    {
+        name: "countryList",
+        path: "/countries",
+        component: () =>
+            import("@/pages/Entity/Country/List.vue"),
+        meta: {
+            title: "CountryList",
+            breadcrumbs: ["dashboard", "countryList"]
+        }
+    },
+    {
+        name: "countryEdit",
+        path: "/countries/:id/edit",
+        component: () =>
+            import("@/pages/Entity/Country/Form.vue"),
+        meta: {
+            title: "CountryEdit",
+            breadcrumbs: ["dashboard", "countryList", "countryEdit"]
+        }
+    },
+    {
+        name: "countryAdd",
+        path: "/countries/add",
+        component: () =>
+            import("@/pages/Entity/Country/Form.vue"),
+        meta: {
+            title: "CountryAdd",
+            breadcrumbs: ["dashboard", "countryList", "countryAdd"]
+        }
+    },
+    /* Region */
+    {
+        name: "regionList",
+        path: "/regions",
+        component: () =>
+            import("@/pages/Entity/Region/List.vue"),
+        meta: {
+            title: "RegionList",
+            breadcrumbs: ["dashboard", "regionList"]
+        }
+    },
+    {
+        name: "regionEdit",
+        path: "/regions/:id/edit",
+        component: () =>
+            import("@/pages/Entity/Region/Form.vue"),
+        meta: {
+            title: "RegionEdit",
+            breadcrumbs: ["dashboard", "regionList", "regionEdit"]
+        }
+    },
+    {
+        name: "regionAdd",
+        path: "/regions/add",
+        component: () =>
+            import("@/pages/Entity/Region/Form.vue"),
+        meta: {
+            title: "RegionAdd",
+            breadcrumbs: ["dashboard", "regionList", "regionAdd"]
+        }
+    },
+    /* EncryptionKey */
+    {
+        name: "encryptionKeyList",
+        path: "/encryption-keys",
+        component: () =>
+            import("@/pages/Entity/EncryptionKey/List.vue"),
+        meta: {
+            title: "EncryptionKeyList",
+            breadcrumbs: ["dashboard", "encryptionKeyList"]
+        }
+    },
+    {
+        name: "encryptionKeyEdit",
+        path: "/encryption-keys/:id/edit",
+        component: () =>
+            import("@/pages/Entity/EncryptionKey/Form.vue"),
+        meta: {
+            title: "EncryptionKeyEdit",
+            breadcrumbs: ["dashboard", "encryptionKeyList", "encryptionKeyEdit"]
+        }
+    },
+    {
+        name: "encryptionKeyAdd",
+        path: "/encryption-keys/add",
+        component: () =>
+            import("@/pages/Entity/EncryptionKey/Form.vue"),
+        meta: {
+            title: "EncryptionKeyAdd",
+            breadcrumbs: ["dashboard", "encryptionKeyList", "encryptionKeyAdd"]
+        }
+    },
+    /* LoginCode */
+    {
+        name: "loginCodeList",
+        path: "/login-codes",
+        component: () =>
+            import("@/pages/Entity/LoginCode/List.vue"),
+        meta: {
+            title: "LoginCodeList",
+            breadcrumbs: ["dashboard", "loginCodeList"]
+        }
+    },
+    {
+        name: "loginCodeEdit",
+        path: "/login-codes/:id/edit",
+        component: () =>
+            import("@/pages/Entity/LoginCode/Form.vue"),
+        meta: {
+            title: "LoginCodeEdit",
+            breadcrumbs: ["dashboard", "loginCodeList", "loginCodeEdit"]
+        }
+    },
+    {
+        name: "loginCodeAdd",
+        path: "/login-codes/add",
+        component: () =>
+            import("@/pages/Entity/LoginCode/Form.vue"),
+        meta: {
+            title: "LoginCodeAdd",
+            breadcrumbs: ["dashboard", "loginCodeList", "loginCodeAdd"]
+        }
+    },
+    /* SiteUser */
+    {
+        name: "siteUserList",
+        path: "/site-users",
+        component: () =>
+            import("@/pages/Entity/SiteUser/List.vue"),
+        meta: {
+            title: "SiteUserList",
+            breadcrumbs: ["dashboard", "siteUserList"]
+        }
+    },
+    {
+        name: "siteUserEdit",
+        path: "/site-users/:id/edit",
+        component: () =>
+            import("@/pages/Entity/SiteUser/Form.vue"),
+        meta: {
+            title: "SiteUserEdit",
+            breadcrumbs: ["dashboard", "siteUserList", "siteUserEdit"]
+        }
+    },
+    {
+        name: "siteUserAdd",
+        path: "/site-users/add",
+        component: () =>
+            import("@/pages/Entity/SiteUser/Form.vue"),
+        meta: {
+            title: "SiteUserAdd",
+            breadcrumbs: ["dashboard", "siteUserList", "siteUserAdd"]
+        }
+    },
+    /* VfsFile */
+    {
+        name: "vfsFileList",
+        path: "/vfs-files",
+        component: () =>
+            import("@/pages/Entity/VfsFile/List.vue"),
+        meta: {
+            title: "VfsFileList",
+            breadcrumbs: ["dashboard", "vfsFileList"]
+        }
+    },
+    {
+        name: "vfsFileEdit",
+        path: "/vfs-files/:id/edit",
+        component: () =>
+            import("@/pages/Entity/VfsFile/Form.vue"),
+        meta: {
+            title: "VfsFileEdit",
+            breadcrumbs: ["dashboard", "vfsFileList", "vfsFileEdit"]
+        }
+    },
+    {
+        name: "vfsFileAdd",
+        path: "/vfs-files/add",
+        component: () =>
+            import("@/pages/Entity/VfsFile/Form.vue"),
+        meta: {
+            title: "VfsFileAdd",
+            breadcrumbs: ["dashboard", "vfsFileList", "vfsFileAdd"]
+        }
+    },
+    /* VfsFolder */
+    {
+        name: "vfsFolderList",
+        path: "/vfs-folders",
+        component: () =>
+            import("@/pages/Entity/VfsFolder/List.vue"),
+        meta: {
+            title: "VfsFolderList",
+            breadcrumbs: ["dashboard", "vfsFolderList"]
+        }
+    },
+    {
+        name: "vfsFolderEdit",
+        path: "/vfs-folders/:id/edit",
+        component: () =>
+            import("@/pages/Entity/VfsFolder/Form.vue"),
+        meta: {
+            title: "VfsFolderEdit",
+            breadcrumbs: ["dashboard", "vfsFolderList", "vfsFolderEdit"]
+        }
+    },
+    {
+        name: "vfsFolderAdd",
+        path: "/vfs-folders/add",
+        component: () =>
+            import("@/pages/Entity/VfsFolder/Form.vue"),
+        meta: {
+            title: "VfsFolderAdd",
+            breadcrumbs: ["dashboard", "vfsFolderList", "vfsFolderAdd"]
+        }
+    },
 ];
diff --git a/generators/vt-template/generator.go b/generators/vt-template/generator.go
index 7375f6f..9239f76 100644
--- a/generators/vt-template/generator.go
+++ b/generators/vt-template/generator.go
@@ -4,7 +4,9 @@ import (
 	"bytes"
 	"fmt"
 	"html/template"
+	"os"
 	"path"
+	"strings"
 
 	"github.com/vmkteam/mfd-generator/mfd"
 
@@ -93,7 +95,7 @@ func (g *Generator) ReadFlags(command *cobra.Command) error {
 	if g.options.FiltersTemplatePath, err = flags.GetString(filterTemplateFlag); err != nil {
 		return err
 	}
-	if g.options.FiltersTemplatePath, err = flags.GetString(formTemplateFlag); err != nil {
+	if g.options.FormTemplatePath, err = flags.GetString(formTemplateFlag); err != nil {
 		return err
 	}
 
@@ -141,7 +143,7 @@ func (g *Generator) Generate() error {
 	}
 
 	// generating routes for all namespaces
-	if _, err := g.SaveRoutes(project.VTNamespaces, routesTemplate); err != nil {
+	if _, err := g.SaveRoutes(project, routesTemplate); err != nil {
 		return fmt.Errorf("generate routes, err=%w", err)
 	}
 
@@ -199,6 +201,32 @@ func (g *Generator) Generate() error {
 	return mfd.SaveMFD(g.options.MFDPath, project)
 }
 
+func (g *Generator) getTargetEntities(project *mfd.Project) []string {
+	var targetEntities []string
+	nsList := g.options.Namespaces
+	if len(nsList) == 0 {
+		nsList = project.NamespaceNames
+	}
+	for _, nsName := range nsList {
+		ns := project.VTNamespace(nsName)
+		if ns == nil {
+			continue
+		}
+		entityNames := ns.VTEntityNames()
+		if len(g.options.Entities) != 0 {
+			entityNames = g.options.Entities
+		}
+
+		for _, eName := range entityNames {
+			if entity := ns.VTEntity(eName); entity != nil {
+				targetEntities = append(targetEntities, entity.Name)
+			}
+		}
+	}
+
+	return targetEntities
+}
+
 // SaveEntity saves vt entity to template with special delims
 func (g *Generator) SaveEntity(entity mfd.VTEntity, output, tmpl string) error {
 	parsed, err := template.New("base").
@@ -221,13 +249,20 @@ func (g *Generator) SaveEntity(entity mfd.VTEntity, output, tmpl string) error {
 }
 
 // SaveRoutes saves all vt namespaces to routes file
-func (g *Generator) SaveRoutes(namespaces []*mfd.VTNamespace, tmpl string) (bool, error) {
+func (g *Generator) SaveRoutes(project *mfd.Project, tmpl string) (bool, error) {
+	var targetEntities []string
+	isPartial := len(g.options.Namespaces) > 0 || len(g.options.Entities) > 0
+
+	if isPartial {
+		targetEntities = g.getTargetEntities(project)
+	}
+
 	parsed, err := template.New("base").Funcs(mfd.TemplateFunctions).Parse(tmpl)
 	if err != nil {
 		return false, fmt.Errorf("parsing template, err=%w", err)
 	}
 
-	pack, err := PackRoutesNamespace(namespaces)
+	pack, err := PackRoutesNamespace(project.VTNamespaces)
 	if err != nil {
 		return false, fmt.Errorf("packing data, err=%w", err)
 	}
@@ -237,7 +272,110 @@ func (g *Generator) SaveRoutes(namespaces []*mfd.VTNamespace, tmpl string) (bool
 		return false, fmt.Errorf("processing model template, err=%w", err)
 	}
 
-	return mfd.Save(buffer.Bytes(), path.Join(g.options.Output, "src/pages/Entity/routes.ts"))
+	routesPath := path.Join(g.options.Output, "src/pages/Entity/routes.ts")
+
+	// base flow when generate all routes
+	if len(targetEntities) == 0 {
+		return mfd.Save(buffer.Bytes(), routesPath)
+	}
+
+	existingData, err := os.ReadFile(routesPath)
+	if err != nil {
+		return mfd.Save(buffer.Bytes(), routesPath)
+	}
+
+	newStr := buffer.String()
+	existingStr := string(existingData)
+
+	for _, entityName := range targetEntities {
+		// get new code block
+		newBlock := extractEntityBlock(newStr, entityName)
+		if len(newBlock) == 0 {
+			continue
+		}
+		// insert new code with flow
+		existingStr = injectEntityBlock(existingStr, entityName, newBlock)
+	}
+
+	return mfd.Save([]byte(existingStr), routesPath)
+}
+
+// extractEntityBlock get block code from content by entity name
+func extractEntityBlock(content string, entityName string) []string {
+	var block []string
+	inBlock := false
+	marker := fmt.Sprintf("/* %s */", entityName)
+
+	lines := strings.Split(content, "\n")
+	for _, line := range lines {
+		trimmed := strings.TrimSpace(line)
+
+		if inBlock {
+			if strings.HasPrefix(trimmed, "/*") || trimmed == "];" {
+				break
+			}
+			block = append(block, strings.TrimPrefix(line, "  "))
+		} else if trimmed == marker {
+			inBlock = true
+		}
+	}
+
+	return block
+}
+
+// injectEntityBlock update or concat body with new blocks
+func injectEntityBlock(existingContent string, entityName string, newBlock []string) string {
+	var result []string
+	inBlock := false
+	found := false
+	marker := fmt.Sprintf("/* %s */", entityName)
+
+	lines := strings.Split(existingContent, "\n")
+	for _, line := range lines {
+		trimmed := strings.TrimSpace(line)
+
+		if inBlock {
+			if strings.HasPrefix(trimmed, "/*") || trimmed == "];" {
+				inBlock = false
+			} else {
+				continue
+			}
+		}
+
+		// Case 1 - when found
+		if !inBlock && trimmed == marker {
+			inBlock = true
+			found = true
+
+			result = append(result, "    "+marker)
+			for _, bLine := range newBlock {
+				result = append(result, "  "+bLine)
+			}
+			continue
+		}
+
+		// Case 2 - not found, create new
+		if !found && trimmed == "];" {
+			if len(result) > 0 {
+				lastIdx := len(result) - 1
+				if strings.HasSuffix(strings.TrimSpace(result[lastIdx]), "}") {
+					result[lastIdx] += ","
+				}
+			}
+
+			result = append(result, "    "+marker)
+			for _, bLine := range newBlock {
+				result = append(result, "  "+bLine)
+			}
+			found = true
+		}
+
+		if !inBlock {
+			result = append(result, line)
+		}
+	}
+
+	return strings.Join(result, "\n")
 }
 
 func (g *Generator) SaveLang(entity *mfd.TranslationEntity, lang string) error {
diff --git a/generators/vt-template/generator_test.go b/generators/vt-template/generator_test.go
index 3d5c8de..bf7727b 100644
--- a/generators/vt-template/generator_test.go
+++ b/generators/vt-template/generator_test.go
@@ -3,6 +3,7 @@ package vttmpl
 import (
 	"os"
 	"path/filepath"
+	"reflect"
 	"strings"
 	"testing"
 
@@ -56,6 +57,7 @@ func TestGenerator_Generate(t *testing.T) {
 
 		Convey("Check correct generate with entities", func() {
 			generator.options.Output = filepath.Join(testdata.PathActual, "vt-template", "entities")
+			// two Entities
 			generator.options.Entities = []string{"Category", "Tag"}
 
 			t.Log("Generate vt-template with entities")
@@ -124,3 +126,244 @@ func fullFilesPaths(path string) ([]string, error) {
 
 	return filePaths, nil
 }
+
+func TestManualGenerate(t *testing.T) {
+	t.Skip()
+	generator := New()
+
+	generator.options.Output = ""
+	generator.options.MFDPath = ""
+	generator.options.Namespaces = []string{"article", "catalogue"}
+	generator.options.Entities = []string{"tag", "category"}
+
+	err := generator.Generate()
+	if err != nil {
+		t.Error(err)
+	}
+}
+
+func Test_extractEntityBlock(t *testing.T) {
+	type args struct {
+		content    string
+		entityName string
+	}
+	tests := []struct {
+		name string
+		args args
+		want []string
+	}{
+		{
+			name: "middle body contains",
+			args: args{
+				entityName: "Category",
+				content: `export default [
+  
+  /* News */
+  {
+    name: "newsList",
+    path: "/news",
+  },
+  /* Category */
+  {
+    name: "categoryList",
+    path: "/category",
+  },
+  /* Tag */
+  {
+    name: "tagList",
+  },
+];`,
+			},
+			want: []string{
+				`{`,
+				`  name: "categoryList",`,
+				`  path: "/category",`,
+				`},`,
+			},
+		},
+		{
+			name: "last body",
+			args: args{
+				entityName: "Tag",
+				content: `export default [
+  /* Category */
+  {
+    name: "categoryList",
+  },
+  /* Tag */
+  {
+    name: "tagList",
+    path: "/tags",
+  }
+];`,
+			},
+			want: []string{
+				`{`,
+				`  name: "tagList",`,
+				`  path: "/tags",`,
+				`}`,
+			},
+		},
+		{
+			name: "now found",
+			args: args{
+				entityName: "News",
+				content: `export default [
+  /* Category */
+  {
+    name: "categoryList",
+  },
+];`,
+			},
+			want: nil,
+		},
+		{
+			name: "empty content",
+			args: args{
+				entityName: "Category",
+				content:    ``,
+			},
+			want: nil,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := extractEntityBlock(tt.args.content, tt.args.entityName)
+
+			if !reflect.DeepEqual(got, tt.want) {
+				t.Errorf("extractEntityBlock() =\n%#v\nwant\n%#v", got, tt.want)
+			}
+		})
+	}
+}
+
+func Test_injectEntityBlock(t *testing.T) {
+	sampleNewBlock := []string{
+		`{`,
+		`  name: "tagList",`,
+		`  path: "/tags",`,
+		`},`,
+	}
+
+	type args struct {
+		existingContent string
+		entityName      string
+		newBlock        []string
+	}
+	tests := []struct {
+		name string
+		args args
+		want string
+	}{
+		{
+			name: "update middle body",
+			args: args{
+				entityName: "Tag",
+				newBlock:   sampleNewBlock,
+				existingContent: `export default [
+  /* Category */
+  {
+    name: "categoryList",
+  },
+  /* Tag */
+  {
+    name: "oldTagList",
+  },
+  /* News */
+  {
+    name: "newsList",
+  }
+];`,
+			},
+			want: `export default [
+  /* Category */
+  {
+    name: "categoryList",
+  },
+    /* Tag */
+  {
+    name: "tagList",
+    path: "/tags",
+  },
+  /* News */
+  {
+    name: "newsList",
+  }
+];`,
+		},
+		{
+			name: "insert new data variant 1",
+			args: args{
+				entityName: "Tag",
+				newBlock:   sampleNewBlock,
+				existingContent: `export default [
+  /* Category */
+  {
+    name: "categoryList",
+  },
+];`,
+			},
+			want: `export default [
+  /* Category */
+  {
+    name: "categoryList",
+  },
+    /* Tag */
+  {
+    name: "tagList",
+    path: "/tags",
+  },
+];`,
+		},
+		{
+			name: "insert new data variant 2",
+			args: args{
+				entityName: "Tag",
+				newBlock:   sampleNewBlock,
+				existingContent: `export default [
+  /* Category */
+  {
+    name: "categoryList"
+  }
+];`,
+			},
+			want: `export default [
+  /* Category */
+  {
+    name: "categoryList"
+  },
+    /* Tag */
+  {
+    name: "tagList",
+    path: "/tags",
+  },
+];`,
+		},
+		{
+			name: "insert new data variant 2",
+			args: args{
+				entityName: "Tag",
+				newBlock:   sampleNewBlock,
+				existingContent: `export default [
+];`,
+			},
+			want: `export default [
+    /* Tag */
+  {
+    name: "tagList",
+    path: "/tags",
+  },
+];`,
+		},
+	}
+
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			got := injectEntityBlock(tt.args.existingContent, tt.args.entityName, tt.args.newBlock)
+			if got != tt.want {
+				t.Errorf("injectEntityBlock() failed.\n\n GOT \n%s\n\n WANT \n%s\n", got, tt.want)
+			}
+		})
+	}
+}
diff --git a/generators/vt-template/template.go b/generators/vt-template/template.go
index 10912aa..1d89d0b 100644
--- a/generators/vt-template/template.go
+++ b/generators/vt-template/template.go
@@ -2,34 +2,37 @@ package vttmpl
 
 const routesDefaultTemplate = `/* eslint-disable */
 export default [{{range $model := .Entities}}
-  /* {{.Name}} */
-  {
-    name: "{{.JSName}}List",
-    path: "/{{.TerminalPath}}",
-    component: () =>
-      import("@/pages/Entity/{{.Name}}/List.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "{{.JSName}}List"]
-    }
-  },
-  {{if not .ReadOnly}}{
-    name: "{{.JSName}}Edit",
-    path: "/{{.TerminalPath}}/:id/edit",
-    component: () =>
-      import("@/pages/Entity/{{.Name}}/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "{{.JSName}}List", "{{.JSName}}Edit"]
-    }
-  },
-  {
-    name: "{{.JSName}}Add",
-    path: "/{{.TerminalPath}}/add",
-    component: () =>
-      import("@/pages/Entity/{{.Name}}/Form.vue"),
-    meta: {
-      breadcrumbs: ["dashboard", "{{.JSName}}List", "{{.JSName}}Add"]
-    }
-  },{{end}}{{end}}
+    /* {{.Name}} */
+    {
+        name: "{{.JSName}}List",
+        path: "/{{.TerminalPath}}",
+        component: () =>
+            import("@/pages/Entity/{{.Name}}/List.vue"),
+        meta: {
+            title: "{{.Name}}List",
+            breadcrumbs: ["dashboard", "{{.JSName}}List"]
+        }
+    },
+    {{if not .ReadOnly}}{
+        name: "{{.JSName}}Edit",
+        path: "/{{.TerminalPath}}/:id/edit",
+        component: () =>
+            import("@/pages/Entity/{{.Name}}/Form.vue"),
+        meta: {
+            title: "{{.Name}}Edit",
+            breadcrumbs: ["dashboard", "{{.JSName}}List", "{{.JSName}}Edit"]
+        }
+    },
+    {
+        name: "{{.JSName}}Add",
+        path: "/{{.TerminalPath}}/add",
+        component: () =>
+            import("@/pages/Entity/{{.Name}}/Form.vue"),
+        meta: {
+            title: "{{.Name}}Add",
+            breadcrumbs: ["dashboard", "{{.JSName}}List", "{{.JSName}}Add"]
+        }
+    },{{end}}{{end}}
 ];
 `
 
@@ -54,27 +57,26 @@ const listDefaultTemplate = `<template>
               <v-flex>
                 <v-layout align-center>
                   <h2 class="ellipsed mr-1">
-                    {{ $t("[[.JSName]].list.title") }}
+                    {{ t("[[.JSName]].list.title") }}
                   </h2>
                   <span
-                    v-if="store.pagination.totalItems"
+                    v-if="pagination.totalItems"
                     class="text--secondary subtitle-2"
                   >
-                    {{ store.pagination.totalItems }}
+                    {{ pagination.totalItems }}
                   </span>
                 </v-layout>
               </v-flex>
               <v-spacer />
               <v-flex shrink>
                 [[if not .ReadOnly]]<v-btn
+                  small
                   dark
                   color="success"
                   :to="{ name: '[[.JSName]]Add' }"
                 >
-                  <v-icon left>
-                    add
-                  </v-icon>
-                  {{ $t("common.list.addNewLabel") }}
+                  <v-icon>add</v-icon>
+                  {{ t("common.list.addNewLabel") }}
                 </v-btn>[[end]]
               </v-flex>
             </v-layout>
@@ -100,9 +102,9 @@ const listDefaultTemplate = `<template>
                     mr-sm-2
                   >
                     <v-text-field
-                      v-model="store.filters.[[.TitleField]]"
+                      v-model="filters.[[.TitleField]]"
                       :placeholder="
-                        $t('[[.JSName]].list.filter.quickFilterPlaceholder')
+                        t('[[.JSName]].list.filter.quickFilterPlaceholder')
                       "
                       hide-details
                       @keyup.enter.native="submitFilters()"
@@ -114,9 +116,10 @@ const listDefaultTemplate = `<template>
                     mr-sm-10
                   >
                     <multi-filters
-                      :filters="store.filters"
-                      :active-filters="store.activeFilters"
+                      :filters="filters"
+                      :active-filters="activeFilters"
                       @submitFilters="submitFilters"
+                      @update:filters="updateFilters"
                     />
                   </v-flex>[[end]]
                   <v-flex
@@ -124,8 +127,8 @@ const listDefaultTemplate = `<template>
                     mt-sm-4
                   >
                     <vt-compact-pagination
-                      :value="store.pagination.page"
-                      :total-pages="store.pagination.totalPages"
+                      :value="pagination.page"
+                      :total-pages="pagination.totalPages"
                       @input="setCompactPagination"
                     />
                   </v-flex>
@@ -136,9 +139,9 @@ const listDefaultTemplate = `<template>
               <v-data-table
                 v-model="selected"
                 :headers="headers"
-                :items="store.list"
-                :options="store.vuetifyTableOptions"
-                :server-items-length="store.pagination.totalItems"
+                :items="list"
+                :options="vuetifyTableOptions"
+                :server-items-length="pagination.totalItems"
                 item-key="[[range .PKs]][[.JSName]][[end]]"
                 :footer-props="{
                   itemsPerPageOptions: [10, 25, 50, 100, 500]
@@ -152,7 +155,7 @@ const listDefaultTemplate = `<template>
                   }
                 ]"
                 :show-select="false"
-                :loading="store.isLoading"
+                :loading="isLoading"
                 fixed-header
                 @update:options="setPagination"
               >[[range .ListColumns]][[if eq .JSName "statusId"]]
@@ -201,34 +204,45 @@ const listDefaultTemplate = `<template>
 </template>
 
 [[raw "<"]]script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityList from '@/common/Entity/EntityList';
-import Store from '@/common/Entity/EntityCollectionStore';
-import {
-  [[.Name]]Summary as Model,
-  [[.Name]]Search as SearchModel
-} from '@/services/api/factory';
+import { computed, defineComponent } from 'vue';
+import { [[.Name]]Summary, [[.Name]]Search } from '@/services/api/factory';
+import { useEntityList } from '@/composables/useEntityList';
+import { useI18n } from '@/composables/useI18n';
+
 import MultiFilters from './components/MultiListFilters.vue';
 
-@Observer
-@Component({
+export default defineComponent({
+  // eslint-disable-next-line vue/multi-word-component-names
   name: 'List',
-  components: { MultiFilters }
-})
-export default class List extends EntityList {
-  store: Store = new Store(Model, SearchModel);
+  components: { MultiFilters },
+
+  setup () {
+    const { t } = useI18n();
+
+    const {
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters
+    } = useEntityList([[.Name]]Summary, [[.Name]]Search);
 
-  get headers () {
-    return [
+    const headers = computed(() => [
       [[range $i, $e := .ListColumns]][[if ne $i 0]]
       },
       [[end]]{[[if eq .JSName "statusId"]]
-        text: this.$t('[[$.JSName]].list.headers.status'),
+        text: t('[[$.JSName]].list.headers.status'),
         value: 'status',
         sortable: false
       [[- else ]]
-        text: this.$t('[[$.JSName]].list.headers.[[.JSName]]'),
+        text: t('[[$.JSName]].list.headers.[[.JSName]]'),
         value: '[[.JSName]]'[[if eq $i 0]],
         align: 'left'[[end]][[if not .IsSortable]],
         sortable: false[[end]][[end]][[end]]
@@ -237,37 +251,71 @@ export default class List extends EntityList {
       [[- else ]]
       },
       {
-        text: this.$t('[[$.JSName]].list.headers.actions'),
+        text: t('[[$.JSName]].list.headers.actions'),
         value: 'id',
         sortable: false
       }[[end]]
-    ];
+    ]);
+
+    return {
+      t,
+      selected,
+      pagination,
+      filters,
+      activeFilters,
+      list,
+      isLoading,
+      vuetifyTableOptions,
+      deleteItem,
+      submitFilters,
+      setCompactPagination,
+      setPagination,
+      updateFilters,
+      headers
+    };
   }
-}
+});
 </script>
 
 <style lang="scss"></style>
 `
 
 const filterDefaultTemplate = `<template>
-  <vt-multi-filter
+  <vt-new-multi-filter
     :items="filterItems"
     :filters="filters"
     autofocus
-    :label="$t('common.list.filter.title')"
+    :label="t('common.list.filter.title')"
     @submitFilters="$emit('submitFilters')"
+    @update:filters="$emit('update:filters', $event)"
   />
 </template>
 
 <script lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
-import EntityListFilters from '@/common/Entity/EntityListFilters';
+import { IFilterItem } from '@/common/MultiFilter/types';
+import { useI18n } from '@/composables/useI18n';
+import { defineComponent } from 'vue';
+
+export default defineComponent({
+  name: 'MultiListFilters',
 
-@Observer
-@Component
-export default class MultiListFilters extends EntityListFilters {
-  filterItems = [
+  props: {
+    filters: {
+      type: Object,
+      required: true
+    },
+    activeFilters: {
+      type: Object,
+      required: true
+    }
+  },
+
+  emits: ['submitFilters', 'update:filters'],
+
+  setup () {
+    const { t } = useI18n();
+
+    const filterItems = [
 [[- $filtersLen := len .FilterColumns ]]
 [[- range $i, $e := .FilterColumns ]]
     [[- if (isLast $i $filtersLen) ]]
@@ -278,7 +326,7 @@ export default class MultiListFilters extends EntityListFilters {
     {
       id: '[[ .JSName ]]',
       type: '[[ .SearchType ]]',
-      title: this.$t('[[ $.JSName ]].list.filter.[[ .JSName ]]'),
+      title: t('[[ $.JSName ]].list.filter.[[ .JSName ]]'),
       value: [[ if .IsCheckBox ]]true[[ else ]]null[[ end ]],
       values: null,
       settings: {
@@ -307,8 +355,14 @@ export default class MultiListFilters extends EntityListFilters {
       }
     }[[ if (notLast $i $filtersLen) ]],[[ end ]]
 [[- end ]]
-  ].filter(Boolean)
-}
+  ].filter(Boolean) as IFilterItem[];
+
+    return {
+      t,
+      filterItems
+    };
+  }
+});
 </script>
 `
 
@@ -329,7 +383,7 @@ const formDefaultTemplate = `<template>
         >
           <v-flex>
             <h2 class="ellipsed">
-              {{ store.model.[[.TitleField]] || "..." }}
+              {{ model.[[.TitleField]] || "..." }}
             </h2>
           </v-flex>
           <v-spacer />
@@ -337,7 +391,7 @@ const formDefaultTemplate = `<template>
             <v-btn
               text
               color="primary"
-              :disabled="store.isLoading"
+              :disabled="isLoading"
               @click.stop="navigateBack"
             >
               <v-icon
@@ -346,7 +400,7 @@ const formDefaultTemplate = `<template>
                 arrow_back
               </v-icon>
               <template v-if="!$vuetify.breakpoint.xsOnly">
-                {{ $t("common.form.cancelButtonLabel") }}
+                {{ t("common.form.cancelButtonLabel") }}
               </template>
             </v-btn>
             <v-hover
@@ -375,7 +429,7 @@ const formDefaultTemplate = `<template>
             Основные
           </v-tab>
         </v-tabs>
-        <v-card v-if="store.model">
+        <v-card v-if="model">
           <v-form
             ref="form"
             @submit.prevent="onSaveAndBack"
@@ -384,26 +438,26 @@ const formDefaultTemplate = `<template>
               <v-tabs-items v-model="tab">
                 <v-tab-item eager>
                   [[raw "<!--  generated part -->"]]
-                  [[range .FormColumns]][[if .IsCheckBox]]<vt-form-field v-model="store.model.[[.JSName]]">
+                  [[range .FormColumns]][[if .IsCheckBox]]<vt-form-field v-model="model.[[.JSName]]">
 					<template #component-slot>
 	                  [[raw "<v-checkbox"]]
-	                    v-model="store.model.[[.JSName]]"
-						[[raw ":error-messages="]]"$t(i18nFieldError(store.errors.[[.JSName]]))"
-                    	:disabled="store.isLoading"
-						:label="$t('[[$.JSName]].form.[[.JSName]]Label')"
+	                    v-model="model.[[.JSName]]"
+						[[raw ":error-messages="]]"getErrorMessage(errors.[[.JSName]])"
+                    	:disabled="isLoading"
+						:label="t('[[$.JSName]].form.[[.JSName]]Label')"
 						color="primary"
 	                  />
 					</template>
                   </vt-form-field>
                   [[else]][[raw "<vt-form-field"]]
-                    v-model="store.model.[[.JSName]]"[[if .IsFK]]
+                    v-model="model.[[.JSName]]"[[if .IsFK]]
                     entity="[[ .FKJSName | ToLower ]]"
                     search-by="[[.FKJSSearch]]"
                     prefetch[[end]]
                     component="[[.Component]]"
-                    :label="$t('[[$.JSName]].form.[[.JSName]]Label')"
-                    :error-messages="$t(i18nFieldError(store.errors.[[.JSName]]))"
-                    :disabled="store.isLoading"
+                    :label="t('[[$.JSName]].form.[[.JSName]]Label')"
+                    :error-messages="getErrorMessage(errors.[[.JSName]])"
+                    :disabled="isLoading"
                     placeholder=""[[if .Required]]
                     required[[else]]
                     clearable[[end]][[if eq .Component "vt-datetime-picker"]]
@@ -424,21 +478,21 @@ const formDefaultTemplate = `<template>
                     <v-btn
                       type="submit"
                       color="success"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="!$vuetify.breakpoint.xsOnly && 'mx-2'"
                     >
                       <v-icon left>
                         done
                       </v-icon>
-                      {{ $t("common.form.saveAndCloseButtonLabel") }}
+                      {{ t("common.form.saveAndCloseButtonLabel") }}
                     </v-btn>
 
                     <v-btn
                       v-if="$route.params.id"
-                      :disabled="!store.isChanged || store.isLoading"
-                      :loading="store.isLoading"
+                      :disabled="!isChanged || isLoading"
+                      :loading="isLoading"
                       :block="$vuetify.breakpoint.xsOnly"
                       :class="[
                         $vuetify.breakpoint.xsOnly && 'ml-0 mt-2',
@@ -448,7 +502,7 @@ const formDefaultTemplate = `<template>
                       color="accent"
                       @click.stop="onSave"
                     >
-                      {{ $t("common.form.saveButtonLabel") }}
+                      {{ t("common.form.saveButtonLabel") }}
                     </v-btn>
                     <v-spacer />
                   </v-layout>
@@ -463,17 +517,58 @@ const formDefaultTemplate = `<template>
 </template>
 
 [[raw "<script"]] lang="ts">
-import { Component } from 'vue-property-decorator';
-import { Observer } from 'mobx-vue';
+import { useEntityForm } from '@/composables/useEntityForm';
+import { useI18n } from '@/composables/useI18n'
 import { [[.Name]] as Model } from '@/services/api/factory';
-import Store from '@/common/Entity/EntityModelStore';
-import EntityForm from '@/common/Entity/EntityForm';
+import { defineComponent } from 'vue';
 
-@Observer
-@Component
-export default class Form extends EntityForm {
-  store: Store<Model> = new Store<Model>(Model);
-}
+export default defineComponent({
+  // eslint-disable-next-line vue/match-component-file-name
+  name: '[[.Name]]Form',
+
+  setup () {
+    const { t } = useI18n();
+
+    const {
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    } = useEntityForm<Model>({ Model} );
+
+	const getErrorMessage = (errorKey: string | null): string => {
+      const errorMessage = i18nFieldError(errorKey);
+      return errorMessage ? t(errorMessage) : '';
+    };
+
+    return {
+      t,
+      tab,
+      form,
+      model,
+      errors,
+      isLoading,
+      isChanged,
+      i18nFieldError,
+      tabsHasError,
+      getErrorMessage,
+
+      onSave,
+      onDelete,
+      navigateBack,
+      onSaveAndBack
+    };
+  }
+});
 </script>
 
 <style scoped></style>
diff --git a/generators/vt-template/vt_template.go b/generators/vt-template/vt_template.go
index cd51ad4..ced2534 100644
--- a/generators/vt-template/vt_template.go
+++ b/generators/vt-template/vt_template.go
@@ -164,7 +164,7 @@ func PackInput(tmpl mfd.TmplAttribute, vtEntity mfd.VTEntity, isSearch bool) Inp
 			trasliteratingValue := template.HTML(mfd.VarName(title.Name))
 
 			inp.Component = "vt-transliterator"
-			inp.Params = append(inp.Params, `:value-for-transliterating="store.model.`+trasliteratingValue+`"`)
+			inp.Params = append(inp.Params, `:value-for-transliterating="model.`+trasliteratingValue+`"`)
 		}
 	}