diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7af16226..44e639e8 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,3 @@
 # CHANGELOG
 
-Lib version: 1.15.0-SNAPSHOT-260828122225
+Lib version: 1.15.0-SNAPSHOT-260828140832
diff --git a/lib/kpi.pb.dart b/lib/kpi.pb.dart
index 96e36566..08bc4c76 100644
--- a/lib/kpi.pb.dart
+++ b/lib/kpi.pb.dart
@@ -181,6 +181,161 @@ class Kpi extends $pb.GeneratedMessage {
   void clearIsQueryable() => $_clearField(13);
 }
 
+class KpiDefinition extends $pb.GeneratedMessage {
+  factory KpiDefinition({
+    $core.String? name,
+    $core.String? level,
+    $core.String? dataType,
+    $core.String? contentType,
+    $core.String? enumValues,
+    $core.String? fullName,
+    $core.bool? isComputed,
+    $core.String? groupToJoin,
+    $core.String? columnType,
+    $core.bool? isQueryable,
+  }) {
+    final result = create();
+    if (name != null) result.name = name;
+    if (level != null) result.level = level;
+    if (dataType != null) result.dataType = dataType;
+    if (contentType != null) result.contentType = contentType;
+    if (enumValues != null) result.enumValues = enumValues;
+    if (fullName != null) result.fullName = fullName;
+    if (isComputed != null) result.isComputed = isComputed;
+    if (groupToJoin != null) result.groupToJoin = groupToJoin;
+    if (columnType != null) result.columnType = columnType;
+    if (isQueryable != null) result.isQueryable = isQueryable;
+    return result;
+  }
+
+  KpiDefinition._();
+
+  factory KpiDefinition.fromBuffer($core.List<$core.int> data, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromBuffer(data, registry);
+  factory KpiDefinition.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
+
+  static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'KpiDefinition', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
+    ..aOS(1, _omitFieldNames ? '' : 'Name', protoName: 'Name')
+    ..aOS(2, _omitFieldNames ? '' : 'Level', protoName: 'Level')
+    ..aOS(4, _omitFieldNames ? '' : 'DataType', protoName: 'DataType')
+    ..aOS(5, _omitFieldNames ? '' : 'ContentType', protoName: 'ContentType')
+    ..aOS(6, _omitFieldNames ? '' : 'EnumValues', protoName: 'EnumValues')
+    ..aOS(8, _omitFieldNames ? '' : 'FullName', protoName: 'FullName')
+    ..aOB(9, _omitFieldNames ? '' : 'IsComputed', protoName: 'IsComputed')
+    ..aOS(11, _omitFieldNames ? '' : 'GroupToJoin', protoName: 'GroupToJoin')
+    ..aOS(12, _omitFieldNames ? '' : 'ColumnType', protoName: 'ColumnType')
+    ..aOB(13, _omitFieldNames ? '' : 'IsQueryable', protoName: 'IsQueryable')
+    ..hasRequiredFields = false
+  ;
+
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  KpiDefinition clone() => KpiDefinition()..mergeFromMessage(this);
+  @$core.Deprecated('See https://github.com/google/protobuf.dart/issues/998.')
+  KpiDefinition copyWith(void Function(KpiDefinition) updates) => super.copyWith((message) => updates(message as KpiDefinition)) as KpiDefinition;
+
+  @$core.override
+  $pb.BuilderInfo get info_ => _i;
+
+  @$core.pragma('dart2js:noInline')
+  static KpiDefinition create() => KpiDefinition._();
+  @$core.override
+  KpiDefinition createEmptyInstance() => create();
+  static $pb.PbList<KpiDefinition> createRepeated() => $pb.PbList<KpiDefinition>();
+  @$core.pragma('dart2js:noInline')
+  static KpiDefinition getDefault() => _defaultInstance ??= $pb.GeneratedMessage.$_defaultFor<KpiDefinition>(create);
+  static KpiDefinition? _defaultInstance;
+
+  @$pb.TagNumber(1)
+  $core.String get name => $_getSZ(0);
+  @$pb.TagNumber(1)
+  set name($core.String value) => $_setString(0, value);
+  @$pb.TagNumber(1)
+  $core.bool hasName() => $_has(0);
+  @$pb.TagNumber(1)
+  void clearName() => $_clearField(1);
+
+  @$pb.TagNumber(2)
+  $core.String get level => $_getSZ(1);
+  @$pb.TagNumber(2)
+  set level($core.String value) => $_setString(1, value);
+  @$pb.TagNumber(2)
+  $core.bool hasLevel() => $_has(1);
+  @$pb.TagNumber(2)
+  void clearLevel() => $_clearField(2);
+
+  @$pb.TagNumber(4)
+  $core.String get dataType => $_getSZ(2);
+  @$pb.TagNumber(4)
+  set dataType($core.String value) => $_setString(2, value);
+  @$pb.TagNumber(4)
+  $core.bool hasDataType() => $_has(2);
+  @$pb.TagNumber(4)
+  void clearDataType() => $_clearField(4);
+
+  @$pb.TagNumber(5)
+  $core.String get contentType => $_getSZ(3);
+  @$pb.TagNumber(5)
+  set contentType($core.String value) => $_setString(3, value);
+  @$pb.TagNumber(5)
+  $core.bool hasContentType() => $_has(3);
+  @$pb.TagNumber(5)
+  void clearContentType() => $_clearField(5);
+
+  @$pb.TagNumber(6)
+  $core.String get enumValues => $_getSZ(4);
+  @$pb.TagNumber(6)
+  set enumValues($core.String value) => $_setString(4, value);
+  @$pb.TagNumber(6)
+  $core.bool hasEnumValues() => $_has(4);
+  @$pb.TagNumber(6)
+  void clearEnumValues() => $_clearField(6);
+
+  @$pb.TagNumber(8)
+  $core.String get fullName => $_getSZ(5);
+  @$pb.TagNumber(8)
+  set fullName($core.String value) => $_setString(5, value);
+  @$pb.TagNumber(8)
+  $core.bool hasFullName() => $_has(5);
+  @$pb.TagNumber(8)
+  void clearFullName() => $_clearField(8);
+
+  @$pb.TagNumber(9)
+  $core.bool get isComputed => $_getBF(6);
+  @$pb.TagNumber(9)
+  set isComputed($core.bool value) => $_setBool(6, value);
+  @$pb.TagNumber(9)
+  $core.bool hasIsComputed() => $_has(6);
+  @$pb.TagNumber(9)
+  void clearIsComputed() => $_clearField(9);
+
+  /// repeated EntityCorrespondence EntityCorrespondences = 10;
+  @$pb.TagNumber(11)
+  $core.String get groupToJoin => $_getSZ(7);
+  @$pb.TagNumber(11)
+  set groupToJoin($core.String value) => $_setString(7, value);
+  @$pb.TagNumber(11)
+  $core.bool hasGroupToJoin() => $_has(7);
+  @$pb.TagNumber(11)
+  void clearGroupToJoin() => $_clearField(11);
+
+  @$pb.TagNumber(12)
+  $core.String get columnType => $_getSZ(8);
+  @$pb.TagNumber(12)
+  set columnType($core.String value) => $_setString(8, value);
+  @$pb.TagNumber(12)
+  $core.bool hasColumnType() => $_has(8);
+  @$pb.TagNumber(12)
+  void clearColumnType() => $_clearField(12);
+
+  @$pb.TagNumber(13)
+  $core.bool get isQueryable => $_getBF(9);
+  @$pb.TagNumber(13)
+  set isQueryable($core.bool value) => $_setBool(9, value);
+  @$pb.TagNumber(13)
+  $core.bool hasIsQueryable() => $_has(9);
+  @$pb.TagNumber(13)
+  void clearIsQueryable() => $_clearField(13);
+}
+
 class KpiExpression extends $pb.GeneratedMessage {
   factory KpiExpression({
     $core.String? block,
@@ -577,7 +732,7 @@ class GetKpisWithSelectionRequest extends $pb.GeneratedMessage {
 
 class GetKpisWithSelectionResult extends $pb.GeneratedMessage {
   factory GetKpisWithSelectionResult({
-    $core.Iterable<Kpi>? kpis,
+    $core.Iterable<KpiDefinition>? kpis,
   }) {
     final result = create();
     if (kpis != null) result.kpis.addAll(kpis);
@@ -590,7 +745,7 @@ class GetKpisWithSelectionResult extends $pb.GeneratedMessage {
   factory GetKpisWithSelectionResult.fromJson($core.String json, [$pb.ExtensionRegistry registry = $pb.ExtensionRegistry.EMPTY]) => create()..mergeFromJson(json, registry);
 
   static final $pb.BuilderInfo _i = $pb.BuilderInfo(_omitMessageNames ? '' : 'GetKpisWithSelectionResult', package: const $pb.PackageName(_omitMessageNames ? '' : 'api'), createEmptyInstance: create)
-    ..pc<Kpi>(1, _omitFieldNames ? '' : 'Kpis', $pb.PbFieldType.PM, protoName: 'Kpis', subBuilder: Kpi.create)
+    ..pc<KpiDefinition>(1, _omitFieldNames ? '' : 'Kpis', $pb.PbFieldType.PM, protoName: 'Kpis', subBuilder: KpiDefinition.create)
     ..hasRequiredFields = false
   ;
 
@@ -612,7 +767,7 @@ class GetKpisWithSelectionResult extends $pb.GeneratedMessage {
   static GetKpisWithSelectionResult? _defaultInstance;
 
   @$pb.TagNumber(1)
-  $pb.PbList<Kpi> get kpis => $_getList(0);
+  $pb.PbList<KpiDefinition> get kpis => $_getList(0);
 }
 
 class GetKpiTableStructureRequest extends $pb.GeneratedMessage {
diff --git a/lib/kpi.pbjson.dart b/lib/kpi.pbjson.dart
index ce6a969f..86199227 100644
--- a/lib/kpi.pbjson.dart
+++ b/lib/kpi.pbjson.dart
@@ -63,6 +63,32 @@ final $typed_data.Uint8List kpiDescriptor = $convert.base64Decode(
     'tHcm91cFRvSm9pbhIeCgpDb2x1bW5UeXBlGAwgASgJUgpDb2x1bW5UeXBlEiAKC0lzUXVlcnlh'
     'YmxlGA0gASgIUgtJc1F1ZXJ5YWJsZQ==');
 
+@$core.Deprecated('Use kpiDefinitionDescriptor instead')
+const KpiDefinition$json = {
+  '1': 'KpiDefinition',
+  '2': [
+    {'1': 'Name', '3': 1, '4': 1, '5': 9, '10': 'Name'},
+    {'1': 'Level', '3': 2, '4': 1, '5': 9, '10': 'Level'},
+    {'1': 'DataType', '3': 4, '4': 1, '5': 9, '10': 'DataType'},
+    {'1': 'ContentType', '3': 5, '4': 1, '5': 9, '10': 'ContentType'},
+    {'1': 'EnumValues', '3': 6, '4': 1, '5': 9, '10': 'EnumValues'},
+    {'1': 'FullName', '3': 8, '4': 1, '5': 9, '10': 'FullName'},
+    {'1': 'IsComputed', '3': 9, '4': 1, '5': 8, '10': 'IsComputed'},
+    {'1': 'GroupToJoin', '3': 11, '4': 1, '5': 9, '10': 'GroupToJoin'},
+    {'1': 'ColumnType', '3': 12, '4': 1, '5': 9, '10': 'ColumnType'},
+    {'1': 'IsQueryable', '3': 13, '4': 1, '5': 8, '10': 'IsQueryable'},
+  ],
+};
+
+/// Descriptor for `KpiDefinition`. Decode as a `google.protobuf.DescriptorProto`.
+final $typed_data.Uint8List kpiDefinitionDescriptor = $convert.base64Decode(
+    'Cg1LcGlEZWZpbml0aW9uEhIKBE5hbWUYASABKAlSBE5hbWUSFAoFTGV2ZWwYAiABKAlSBUxldm'
+    'VsEhoKCERhdGFUeXBlGAQgASgJUghEYXRhVHlwZRIgCgtDb250ZW50VHlwZRgFIAEoCVILQ29u'
+    'dGVudFR5cGUSHgoKRW51bVZhbHVlcxgGIAEoCVIKRW51bVZhbHVlcxIaCghGdWxsTmFtZRgIIA'
+    'EoCVIIRnVsbE5hbWUSHgoKSXNDb21wdXRlZBgJIAEoCFIKSXNDb21wdXRlZBIgCgtHcm91cFRv'
+    'Sm9pbhgLIAEoCVILR3JvdXBUb0pvaW4SHgoKQ29sdW1uVHlwZRgMIAEoCVIKQ29sdW1uVHlwZR'
+    'IgCgtJc1F1ZXJ5YWJsZRgNIAEoCFILSXNRdWVyeWFibGU=');
+
 @$core.Deprecated('Use kpiExpressionDescriptor instead')
 const KpiExpression$json = {
   '1': 'KpiExpression',
@@ -156,14 +182,14 @@ final $typed_data.Uint8List getKpisWithSelectionRequestDescriptor = $convert.bas
 const GetKpisWithSelectionResult$json = {
   '1': 'GetKpisWithSelectionResult',
   '2': [
-    {'1': 'Kpis', '3': 1, '4': 3, '5': 11, '6': '.api.Kpi', '10': 'Kpis'},
+    {'1': 'Kpis', '3': 1, '4': 3, '5': 11, '6': '.api.KpiDefinition', '10': 'Kpis'},
   ],
 };
 
 /// Descriptor for `GetKpisWithSelectionResult`. Decode as a `google.protobuf.DescriptorProto`.
 final $typed_data.Uint8List getKpisWithSelectionResultDescriptor = $convert.base64Decode(
-    'ChpHZXRLcGlzV2l0aFNlbGVjdGlvblJlc3VsdBIcCgRLcGlzGAEgAygLMgguYXBpLktwaVIES3'
-    'Bpcw==');
+    'ChpHZXRLcGlzV2l0aFNlbGVjdGlvblJlc3VsdBImCgRLcGlzGAEgAygLMhIuYXBpLktwaURlZm'
+    'luaXRpb25SBEtwaXM=');
 
 @$core.Deprecated('Use getKpiTableStructureRequestDescriptor instead')
 const GetKpiTableStructureRequest$json = {
diff --git a/pubspec.yaml b/pubspec.yaml
index 5f5f3576..7181bbfe 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: dart_core_sdk
 description: dart libs from core model proto files
-version: 1.15.0-SNAPSHOT-260828122225
+version: 1.15.0-SNAPSHOT-260828140832
 homepage: ''
 publish_to: ''
 repository: ''