diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/gateway-connector-version-processor.abstract.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/gateway-connector-version-processor.abstract.ts
index 923cf1920b..579ad6a45b 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/gateway-connector-version-processor.abstract.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/abstract/gateway-connector-version-processor.abstract.ts
@@ -31,6 +31,6 @@ export abstract class GatewayConnectorVersionProcessor<BasicConfig> {
     return Number(version?.replace(/\./g, ''));
   }
 
-  abstract getDowngradedVersion(): GatewayConnector<BasicConfig>;
-  abstract getUpgradedVersion(): GatewayConnector<BasicConfig>;
+  protected abstract getDowngradedVersion(): GatewayConnector<BasicConfig>;
+  protected abstract getUpgradedVersion(): GatewayConnector<BasicConfig>;
 }
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.abstract.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.abstract.ts
index 0394604d42..aeef688333 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.abstract.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.abstract.ts
@@ -31,7 +31,7 @@ import { isObject } from '@core/utils';
 export abstract class AbstractMqttBasicConfigComponent<BasicConfig> implements ControlValueAccessor, Validator, OnDestroy {
 
   basicFormGroup: FormGroup;
-  mappingTypes = MappingType;
+  MappingType = MappingType;
 
   private destroy$ = new Subject<void>();
 
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.component.html b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.component.html
index 9ad25aa851..b602ba20d4 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.component.html
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/connectors-configuration/mqtt/basic-config/mqtt-basic-config.component.html
@@ -24,12 +24,12 @@
   </mat-tab>
   <mat-tab label="{{ 'gateway.data-mapping' | translate }}*">
     <div class="tb-form-panel no-border no-padding padding-top tb-flex fill-height">
-      <tb-mapping-table formControlName="mapping" [required]="true" [mappingType]="mappingTypes.DATA"></tb-mapping-table>
+      <tb-mapping-table formControlName="mapping" [required]="true" [mappingType]="MappingType.DATA"></tb-mapping-table>
     </div>
   </mat-tab>
   <mat-tab label="{{ 'gateway.requests-mapping' | translate }}">
     <div class="tb-form-panel no-border no-padding padding-top tb-flex fill-height">
-      <tb-mapping-table formControlName="requestsMapping" [mappingType]="mappingTypes.REQUESTS"></tb-mapping-table>
+      <tb-mapping-table formControlName="requestsMapping" [mappingType]="MappingType.REQUESTS"></tb-mapping-table>
     </div>
   </mat-tab>
   <mat-tab label="{{ 'gateway.workers-settings' | translate }}">
diff --git a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/gateway-connector-version-mapping.util.ts b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/gateway-connector-version-mapping.util.ts
index 9de53e506d..12f3a7c439 100644
--- a/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/gateway-connector-version-mapping.util.ts
+++ b/ui-ngx/src/app/modules/home/components/widget/lib/gateway/utils/gateway-connector-version-mapping.util.ts
@@ -15,9 +15,9 @@
 ///
 
 import {
-  ConnectorBaseConfig,
   ConnectorType,
-  GatewayConnector, MQTTBasicConfig,
+  GatewayConnector,
+  MQTTBasicConfig,
 } from '@home/components/widget/lib/gateway/gateway-widget.models';
 import { MqttVersionProcessor } from '@home/components/widget/lib/gateway/abstract/mqtt-version-processor.abstract';