diff --git a/.github/workflows/build-release.yml b/.github/workflows/build-release.yml
index 44beb16..7e8a15e 100644
--- a/.github/workflows/build-release.yml
+++ b/.github/workflows/build-release.yml
@@ -32,8 +32,8 @@ jobs:
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: build image & push to registry
         uses: docker/build-push-action@v2
@@ -41,4 +41,3 @@ jobs:
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ steps.version.outputs.prop }}
           labels: com.exactpro.th2.${{ steps.repo.outputs.REPOSITORY_NAME }}=${{ steps.version.outputs.prop }}
-
diff --git a/.github/workflows/build-snapshot.yml b/.github/workflows/build-snapshot.yml
index 87187f1..54b5e18 100644
--- a/.github/workflows/build-snapshot.yml
+++ b/.github/workflows/build-snapshot.yml
@@ -43,8 +43,8 @@ jobs:
         uses: docker/login-action@v1
         with:
           registry: ghcr.io
-          username: ${{ github.repository_owner }}
-          password: ${{ secrets.CR_PAT }}
+          username: ${{ github.actor }}
+          password: ${{ secrets.GITHUB_TOKEN }}
 
       - name: build image & push to registry
         uses: docker/build-push-action@v2
@@ -52,4 +52,3 @@ jobs:
           push: true
           tags: ghcr.io/${{ github.repository }}:${{ steps.snapshot_name.outputs.value }}
           labels: com.exactpro.th2.${{ steps.repo.outputs.REPOSITORY_NAME }}=${{ steps.version.outputs.prop }}
-
diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml
index cd7adcf..c0fe2b5 100644
--- a/.github/workflows/ci-unwelcome-words.yml
+++ b/.github/workflows/ci-unwelcome-words.yml
@@ -7,17 +7,17 @@ jobs:
   test:
     runs-on: ubuntu-20.04
     steps:
-    - uses: actions/checkout@v2
-      with:
-        ref: ${{ github.sha }}
-    - name: Checkout tool
-      uses: actions/checkout@v2
-      with:
-        repository: exactpro-th2/ci-github-action
-        ref: master
-        token: ${{ secrets.PAT_CI_ACTION }}
-        path: ci-github-action
-    - name: Run CI action
-      uses: ./ci-github-action
-      with:
-        ref: ${{ github.sha }}
+      - uses: actions/checkout@v2
+        with:
+          ref: ${{ github.sha }}
+      - name: Checkout tool
+        uses: actions/checkout@v2
+        with:
+          repository: exactpro-th2/ci-github-action
+          ref: master
+          token: ${{ secrets.PAT_CI_ACTION }}
+          path: ci-github-action
+      - name: Run CI action
+        uses: ./ci-github-action
+        with:
+          ref: ${{ github.sha }}
diff --git a/package.json b/package.json
index 89a5932..c844e5a 100644
--- a/package.json
+++ b/package.json
@@ -1,7 +1,7 @@
 {
 	"homepage": ".",
 	"name": "th2-infra-editor",
-	"version": "2.1.4",
+	"version": "2.1.5",
 	"private": true,
 	"dependencies": {
 		"@monaco-editor/loader": "^1.3.2",
diff --git a/src/components/Header.tsx b/src/components/Header.tsx
index 80698b4..1556be4 100644
--- a/src/components/Header.tsx
+++ b/src/components/Header.tsx
@@ -126,8 +126,7 @@ function Header() {
 					<select
 						disabled={requestsExist}
 						onChange={e => selectSchema(e.target.value)}
-						value={selectedSchemaName || undefined}
-					>
+						value={selectedSchemaName || undefined}>
 						{schemas.map(schema => (
 							<option key={schema} value={schema}>
 								{schema}
@@ -142,8 +141,7 @@ function Header() {
 				onClick={() => {
 					setOpenConfirmationModal(true);
 					setConfirmationModalType('save');
-				}}
-			>
+				}}>
 				<span className={requestsExist ? classes.badge : classes.disableBadge}>
 					{preparedRequests.length}
 				</span>
@@ -155,8 +153,7 @@ function Header() {
 					onClick={() => {
 						setOpenConfirmationModal(true);
 						setConfirmationModalType('discard');
-					}}
-				>
+					}}>
 					Discard changes
 				</button>
 			)}
diff --git a/src/components/config/Config.tsx b/src/components/config/Config.tsx
index 279ae8e..007bd67 100644
--- a/src/components/config/Config.tsx
+++ b/src/components/config/Config.tsx
@@ -57,8 +57,8 @@ function Config() {
 	const boxUpdater = useBoxUpdater();
 
 	const customConfig = useInput({
-		initialValue: selectedBox?.spec['custom-config']
-			? JSON.stringify(selectedBox?.spec['custom-config'], null, 4)
+		initialValue: selectedBox?.spec['customConfig']
+			? JSON.stringify(selectedBox?.spec['customConfig'], null, 4)
 			: '',
 		id: 'custom-config',
 	});
@@ -69,20 +69,20 @@ function Config() {
 	});
 
 	const extendedSettings = useInput({
-		initialValue: selectedBox?.spec['extended-settings']
-			? JSON.stringify(selectedBox.spec['extended-settings'], null, 4)
+		initialValue: selectedBox?.spec['extendedSettings']
+			? JSON.stringify(selectedBox.spec['extendedSettings'], null, 4)
 			: '',
 		id: 'extended-settings',
 	});
 
 	const imageName = useInput({
-		initialValue: selectedBox?.spec['image-name'] || '',
+		initialValue: selectedBox?.spec['imageName'] || '',
 		id: 'imageName',
 		label: 'Image name',
 	});
 
 	const imageVersion = useInput({
-		initialValue: selectedBox?.spec['image-version'] || '',
+		initialValue: selectedBox?.spec['imageVersion'] || '',
 		id: 'imageVersion',
 		label: 'Image version',
 	});
@@ -116,10 +116,10 @@ function Config() {
 				name: name.value,
 				spec: {
 					...originalBox.spec,
-					'custom-config': customConfig.value ? JSON.parse(customConfig.value) : '',
-					'image-name': imageName.value,
-					'image-version': imageVersion.value,
-					'extended-settings': extendedSettings.value ? JSON.parse(extendedSettings.value) : '',
+					customConfig: customConfig.value ? JSON.parse(customConfig.value) : '',
+					imageName: imageName.value,
+					imageVersion: imageVersion.value,
+					extendedSettings: extendedSettings.value ? JSON.parse(extendedSettings.value) : '',
 					pins: JSON.parse(pinsConfig.value),
 				},
 			});
@@ -163,10 +163,10 @@ interface ConfigurableBoxOptions {
 	kind: BoxEntity['kind'];
 	name: BoxEntity['name'];
 	spec: {
-		'custom-config': BoxEntity['spec']['custom-config'];
-		'image-name': BoxEntity['spec']['image-name'];
-		'image-version': BoxEntity['spec']['image-version'];
-		'extended-settings': BoxEntity['spec']['extended-settings'];
+		customConfig: BoxEntity['spec']['customConfig'];
+		imageName: BoxEntity['spec']['imageName'];
+		imageVersion: BoxEntity['spec']['imageVersion'];
+		extendedSettings: BoxEntity['spec']['extendedSettings'];
 		pins: BoxEntity['spec']['pins'];
 	};
 }
diff --git a/src/components/config/ConfigEditor.tsx b/src/components/config/ConfigEditor.tsx
index c2dff0d..cf4b9f9 100644
--- a/src/components/config/ConfigEditor.tsx
+++ b/src/components/config/ConfigEditor.tsx
@@ -48,8 +48,8 @@ const ConfigEditor = ({ value, setValue, schema, pinsConnectionsLenses = false }
 	const setLens = () => {
 		const lenses: monacoEditor.languages.CodeLens[] = [];
 		const pinsConnections = getCountPinsConnections(
-			boxesStore.selectedBox?.spec.pins,
 			boxUpdater.selectedBoxConnections,
+			boxesStore.selectedBox?.spec.pins,
 		);
 		const pinsPositions: PinsPositions[] = [];
 		if (pinsConnections) {
diff --git a/src/components/editors/ConnectionConfig.tsx b/src/components/editors/ConnectionConfig.tsx
index 432a120..85ba2ea 100644
--- a/src/components/editors/ConnectionConfig.tsx
+++ b/src/components/editors/ConnectionConfig.tsx
@@ -16,7 +16,7 @@
 
 import { createUseStyles } from 'react-jss';
 import { Theme } from '../../styles/theme';
-import { ExtendedConnectionOwner } from '../../models/Box';
+import { ExtendedConnectionOwner, getPinConnectionType, getPins } from '../../models/Box';
 import { useInput } from '../../hooks/useInput';
 import Input from '../util/Input';
 import { observer } from 'mobx-react-lite';
@@ -118,7 +118,7 @@ function ConnectionConfig(props: ConnectionConfigProps) {
 			return [];
 		}
 
-		return box.spec.pins ?? [];
+		return getPins(box.spec.pins);
 	}, [box]);
 
 	const pinValidate = useCallback(pin => pins.map(pin => pin.name).includes(pin), [pins]);
@@ -145,12 +145,13 @@ function ConnectionConfig(props: ConnectionConfigProps) {
 	const isPinSupportedServiceClassOption = useCallback(() => {
 		return (
 			pinValidate(pinInput.value) &&
-			pins.filter(item => item.name === pinInput.value)[0]['connection-type'] === 'mq'
+			getPinConnectionType(pins.filter(item => item.name === pinInput.value)[0], box?.spec.pins) ===
+				'mq'
 		);
 	}, [pinInput.value, pinValidate, pins]);
 
 	const serviceClassInput = useInput({
-		initialValue: owner?.['service-class'] || '',
+		initialValue: owner?.['serviceClass'] || '',
 		id: `${id}ServiceClass`,
 		label: 'Service class',
 		disabled: disabled || isPinSupportedServiceClassOption(),
@@ -176,8 +177,11 @@ function ConnectionConfig(props: ConnectionConfigProps) {
 			box: boxInput.value,
 			pin: pinInput.value,
 			strategy: strategyInput.value,
-			'service-class': serviceClassInput.value,
-			connectionType: pins.filter(item => item.name === pinInput.value)[0]['connection-type'],
+			serviceClass: serviceClassInput.value,
+			connectionType: getPinConnectionType(
+				pins.filter(item => item.name === pinInput.value)[0],
+				box?.spec.pins,
+			),
 		});
 	}, [
 		boxInput.isValid,
diff --git a/src/components/editors/ConnectionEditor.tsx b/src/components/editors/ConnectionEditor.tsx
index 62ca29d..6d812a5 100644
--- a/src/components/editors/ConnectionEditor.tsx
+++ b/src/components/editors/ConnectionEditor.tsx
@@ -16,7 +16,7 @@
 
 import { useCallback, useMemo, useState } from 'react';
 import { createUseStyles } from 'react-jss';
-import { ExtendedConnectionOwner, isBoxEntity, Pin } from '../../models/Box';
+import { ExtendedConnectionOwner, getPins, isBoxEntity, Pin } from '../../models/Box';
 import { Theme } from '../../styles/theme';
 import classNames from 'classnames';
 import { observer } from 'mobx-react-lite';
@@ -209,7 +209,7 @@ function ConnectionEditor(props: ConnectionsEditorProps) {
 				.filter(box => box.name === owner.box)
 				.uniqBy('name')
 				.filter(isBoxEntity)
-				.map(box => box.spec?.pins || [])
+				.map(box => getPins(box.spec.pins))
 				.flatten()
 				.filter(pin => pin.name === owner.pin)
 				.head()
@@ -220,11 +220,7 @@ function ConnectionEditor(props: ConnectionsEditorProps) {
 			}
 
 			return chain(boxesStore.boxes)
-				.filter(
-					box =>
-						(box.spec?.pins || []).filter(box => box['connection-type'] === pin['connection-type'])
-							.length > 0,
-				)
+				.filter(box => getPins(box.spec.pins, owner.connectionType).length > 0)
 				.map(box => box.name)
 				.value();
 		},
@@ -321,8 +317,7 @@ function ConnectionEditor(props: ConnectionsEditorProps) {
 			<div className={classes.actions}>
 				<button
 					onClick={cancelOrDelete}
-					className={classNames(classes.button, classes.deleteButton)}
-				>
+					className={classNames(classes.button, classes.deleteButton)}>
 					{editableLink ? 'Delete' : 'Cancel'}
 				</button>
 				<button onClick={submit} className={submitButtonClassName}>
diff --git a/src/components/layouts/BoxCreationLayout.tsx b/src/components/layouts/BoxCreationLayout.tsx
index 78d708f..b470b56 100644
--- a/src/components/layouts/BoxCreationLayout.tsx
+++ b/src/components/layouts/BoxCreationLayout.tsx
@@ -71,21 +71,21 @@ const BoxCreationLayout = () => {
 	});
 
 	const imageName = useInput({
-		id: 'box-image-name',
-		name: 'box-image-name',
+		id: 'boxImageName',
+		name: 'boxImageName',
 		label: 'Image name',
 	});
 
 	const imageVersion = useInput({
-		id: 'box-image-version',
-		name: 'box-image-version',
+		id: 'boxImageVersion',
+		name: 'boxImageVersion',
 		label: 'Image version',
 	});
 
 	const nodePort = useInput({
 		label: 'Node port',
-		id: 'node-port',
-		name: 'node-port',
+		id: 'nodePort',
+		name: 'nodePort',
 		validate: (value: string) =>
 			value.trim().length > 0 ? /^\d+$/.test(value) && parseInt(value) <= 65535 : true,
 		required: false,
@@ -100,11 +100,11 @@ const BoxCreationLayout = () => {
 			let nodePort = parseInt(nodePortString) || null;
 
 			const spec: BoxEntity['spec'] = {
-				pins: [],
-				'image-name': imageName,
-				'image-version': imageVersion,
+				pins: {},
+				imageName: imageName,
+				imageVersion: imageVersion,
 				type,
-				'extended-settings': {
+				extendedSettings: {
 					service: {
 						enabled: false,
 					},
@@ -141,8 +141,7 @@ const BoxCreationLayout = () => {
 			<button
 				disabled={inputs.some(input => !input.isValid)}
 				className={classes.submitButton}
-				onClick={createNewBox}
-			>
+				onClick={createNewBox}>
 				Create
 			</button>
 		</div>
diff --git a/src/components/links/Links.tsx b/src/components/links/Links.tsx
index 0588df1..88f71f9 100644
--- a/src/components/links/Links.tsx
+++ b/src/components/links/Links.tsx
@@ -22,7 +22,7 @@ import { useBoxUpdater } from '../../hooks/useBoxUpdater';
 import { useBoxesStore } from '../../hooks/useBoxesStore';
 import { useEffect, useMemo, useState } from 'react';
 import ConnectionEditor from '../editors/ConnectionEditor';
-import { BoxEntity, ExtendedConnectionOwner, Pin } from '../../models/Box';
+import { BoxEntity, ExtendedConnectionOwner, getPinConnectionType, Pin } from '../../models/Box';
 import SelectedBox from '../resources/SelectedBox';
 import { ConnectionDirection, Link } from '../../models/LinksDefinition';
 import { chain } from 'lodash';
@@ -106,7 +106,7 @@ function Links() {
 			.filter(link => link[direction]?.box === boxesStore.selectedBox?.name)
 			.filter(link => link[direction === 'from' ? 'to' : 'from']?.box === box?.name)
 			.filter(link => link[direction]?.pin === pin?.name)
-			.filter(link => link[direction]?.connectionType === pin?.['connection-type'])
+			.filter(link => link[direction]?.connectionType === getPinConnectionType(pin, box?.spec.pins))
 			.head()
 			.value();
 
diff --git a/src/components/resources/Box.tsx b/src/components/resources/Box.tsx
index f5bc71f..bb750bd 100644
--- a/src/components/resources/Box.tsx
+++ b/src/components/resources/Box.tsx
@@ -143,7 +143,7 @@ function Box(props: Props) {
 	const subscriptionStore = useSubscriptionStore();
 	const status = useRef(subscriptionStore.boxStates.get(box.name) || BoxStatus.PENDING);
 
-	const slicedImageName = getImageNameWithoutDomain(box.spec['image-name']);
+	const slicedImageName = getImageNameWithoutDomain(box.spec['imageName']);
 
 	return (
 		<div
@@ -151,15 +151,13 @@ function Box(props: Props) {
 				[classes.selectable]: typeof onSelect === 'function',
 				[classes.selected]: isSelected,
 			})}
-			onClick={() => onSelect && onSelect(box)}
-		>
+			onClick={() => onSelect && onSelect(box)}>
 			<div className={classes.header}>
 				<Status status={status.current} />
 				<span
 					style={{ backgroundColor: color }}
 					className={classNames(classes.bodyValue, classes.type)}
-					title={getBoxType(box)}
-				>
+					title={getBoxType(box)}>
 					{getBoxType(box)}
 				</span>
 				<h5 className={classes.name} title={box.name}>
diff --git a/src/components/resources/SelectedBox.tsx b/src/components/resources/SelectedBox.tsx
index d53871f..0a06870 100644
--- a/src/components/resources/SelectedBox.tsx
+++ b/src/components/resources/SelectedBox.tsx
@@ -113,7 +113,7 @@ function SelectedBox(props: Props) {
 	// TODO: fix status
 	const status = useMemo(() => Object.values(BoxStatus)[box.name.length % 2], [box.name.length]);
 
-	const slicedImageName = getImageNameWithoutDomain(box.spec['image-name']);
+	const slicedImageName = getImageNameWithoutDomain(box.spec['imageName']);
 
 	return (
 		<div className={classes.container}>
diff --git a/src/helpers/link.ts b/src/helpers/link.ts
index b12b656..b8455d0 100644
--- a/src/helpers/link.ts
+++ b/src/helpers/link.ts
@@ -38,8 +38,8 @@ export function convertToExtendedLink(
 	convertedLink = addAdditionalDetailsToLink(convertedLink, {
 		fromStrategy: link.from?.strategy,
 		toStrategy: link.to?.strategy,
-		fromServiceClass: link.from?.['service-class'],
-		toServiceClass: link.to?.['service-class'],
+		fromServiceClass: link.from?.['serviceClass'],
+		toServiceClass: link.to?.['serviceClass'],
 	}) as Link<ExtendedConnectionOwner>;
 
 	return convertedLink;
@@ -61,8 +61,8 @@ export function convertToOriginLink(link: Link<ExtendedConnectionOwner>): Link<C
 	convertedLink = addAdditionalDetailsToLink(convertedLink, {
 		fromStrategy: link.from?.strategy,
 		toStrategy: link.to?.strategy,
-		fromServiceClass: link.from?.['service-class'],
-		toServiceClass: link.to?.['service-class'],
+		fromServiceClass: link.from?.['serviceClass'],
+		toServiceClass: link.to?.['serviceClass'],
 	}) as Link<ExtendedConnectionOwner>;
 
 	return convertedLink;
@@ -84,7 +84,7 @@ export function addAdditionalDetailsToLink(
 			tempLink.from.strategy = details.fromStrategy;
 		}
 		if (details.fromServiceClass) {
-			tempLink.from['service-class'] = details.fromServiceClass;
+			tempLink.from['serviceClass'] = details.fromServiceClass;
 		}
 	}
 
@@ -93,7 +93,7 @@ export function addAdditionalDetailsToLink(
 			tempLink.to.strategy = details.toStrategy;
 		}
 		if (details.toServiceClass) {
-			tempLink.to['service-class'] = details.toServiceClass;
+			tempLink.to['serviceClass'] = details.toServiceClass;
 		}
 	}
 
diff --git a/src/helpers/pinConnections.ts b/src/helpers/pinConnections.ts
index dfa78d7..7b43a73 100644
--- a/src/helpers/pinConnections.ts
+++ b/src/helpers/pinConnections.ts
@@ -16,7 +16,7 @@
 
 import { IPosition } from 'monaco-editor';
 import { IPinConnections } from '../components/links/BoxConnections';
-import { ExtendedConnectionOwner, Pin } from '../models/Box';
+import { ExtendedConnectionOwner, getPins, Pin, Pins } from '../models/Box';
 import { Link } from '../models/LinksDefinition';
 import { IBoxConnections } from '../components/links/BoxConnections';
 
@@ -42,14 +42,14 @@ export type InvalidLink = {
 };
 
 export function getCountPinsConnections(
-	selectedBoxPins: any,
 	selectedBoxConnections: [IBoxConnections, IBoxConnections] | [null, null],
+	selectedBoxPins?: Pins,
 ): PinsInfo[] | null {
 	const [toConnections, fromConnections] = selectedBoxConnections;
 	const allConnections = [...(toConnections?.pins || []), ...(fromConnections?.pins || [])];
 	if (selectedBoxPins && allConnections) {
 		const pinsInfoArray: PinsInfo[] = [];
-		selectedBoxPins.forEach((pin: Pin, index: number) => {
+		getPins(selectedBoxPins).forEach((pin: Pin, index: number) => {
 			pinsInfoArray[index] = { name: pin.name, numOfConnections: 0 };
 			allConnections.forEach((iPinConnection: IPinConnections) => {
 				if (JSON.stringify(iPinConnection.pin) === JSON.stringify(pin)) {
diff --git a/src/models/Box.ts b/src/models/Box.ts
index fc85b83..9590c8e 100644
--- a/src/models/Box.ts
+++ b/src/models/Box.ts
@@ -15,15 +15,20 @@
  ***************************************************************************** */
 
 import FileBase from './FileBase';
-import { DictionaryRelation } from './Dictionary';
 
 export interface BoxEntity extends FileBase {
 	spec: {
-		['custom-config']?: {
+		['customConfig']?: {
+			[prop: string]: object;
+		};
+		['mqRouter']?: {
+			[prop: string]: string;
+		};
+		['grpcRouter']?: {
 			[prop: string]: string;
 		};
-		['extended-settings']: {
-			['chart-cfg']?: {
+		['extendedSettings']: {
+			['chartCfg']?: {
 				path: string;
 				ref: string;
 			};
@@ -42,27 +47,37 @@ export interface BoxEntity extends FileBase {
 				targetPort?: string;
 			};
 		};
-		['image-name']: string;
-		['image-version']: string;
-		['node-port']?: number;
-		['dictionaries-relation']?: Array<DictionaryRelation>;
-		data?: string;
-		pins?: Array<Pin>;
+		['imageName']: string;
+		['imageVersion']: string;
+		['versionRange']?: string;
+		['bookName']?: string;
+		pins?: Pins;
+		disabled?: boolean;
 		type: string;
 	};
 }
 
+export interface Pins {
+	mq?: {
+		subscribers?: Array<Pin>;
+		publishers?: Array<Pin>;
+	};
+	grpc?: {
+		server?: Array<Pin>;
+		client?: Array<Pin>;
+	};
+}
+
 export interface Pin {
+	name: string;
 	attributes?: Array<string>;
-	['connection-type']: 'mq' | 'grpc';
 	filters?: Array<Filter>;
-	name: string;
 }
 
 export interface Filter {
 	metadata: {
-		['field-name']: string;
-		['expected-value']: string;
+		['fieldName']: string;
+		['expectedValue']: string;
 		['operation']: string;
 	}[];
 }
@@ -86,7 +101,7 @@ export interface ConnectionOwner {
 	box: string;
 	pin: string;
 	strategy?: string;
-	['service-class']?: string;
+	['serviceClass']?: string;
 }
 
 export interface ExtendedConnectionOwner extends ConnectionOwner {
@@ -105,11 +120,43 @@ export function isBoxEntity(object: unknown): object is BoxEntity {
 }
 
 export function isPin(object: unknown): object is Pin {
-	return (
-		typeof object === 'object' &&
-		object !== null &&
-		(object as Pin)['connection-type'] !== undefined
-	);
+	return typeof object === 'object' && object !== null && (object as Pin).name !== undefined;
+}
+
+export function getPins(pins?: Pins, connectionType?: 'mq' | 'grpc'): Pin[] {
+	let result: Pin[] = [];
+
+	if (pins) {
+		if (connectionType === 'mq') {
+			result = [...(pins.mq?.publishers || []), ...(pins.mq?.subscribers || [])];
+		} else if (connectionType === 'grpc') {
+			result = [...(pins.grpc?.client || []), ...(pins.grpc?.server || [])];
+		} else {
+			result = [
+				...(pins.mq?.publishers || []),
+				...(pins.mq?.subscribers || []),
+				...(pins.grpc?.client || []),
+				...(pins.grpc?.server || []),
+			];
+		}
+	}
+
+	return result;
+}
+
+export function getPinConnectionType(pin?: Pin, pins?: Pins): 'mq' | 'grpc' {
+	const mqPins = getPins(pins, 'mq');
+	const grpcPins = getPins(pins, 'grpc');
+
+	if (mqPins.length > 0 && pin && mqPins.some(mqPin => mqPin.name === pin.name)) {
+		return 'mq';
+	}
+
+	if (grpcPins.length > 0 && pin && grpcPins.some(grpcPin => grpcPin.name === pin.name)) {
+		return 'grpc';
+	}
+
+	return 'mq';
 }
 
 export enum BoxStatus {
diff --git a/src/models/Schemas.ts b/src/models/Schemas.ts
index 64f1c42..f78a487 100644
--- a/src/models/Schemas.ts
+++ b/src/models/Schemas.ts
@@ -20,85 +20,220 @@ export type schemaTemplate = {
 	schema: any;
 };
 
-const _pinSchema = {
+const _filterProps = {
 	type: 'array',
 	items: {
 		type: 'object',
 		properties: {
-			name: { type: 'string' },
-			'connection-type': { enum: ['mq', 'grpc'] },
-			filters: {
-				type: 'array',
-				items: {
-					type: 'object',
-					properties: {
-						metadata: {
-							type: 'array',
-							items: {
+			fieldName: { type: 'string' },
+			expectedValue: { type: 'string' },
+			operation: { type: 'string' },
+		},
+		additionalProperties: false,
+		required: ['fieldName', 'expectedValue', 'operation'],
+	},
+};
+
+const _filtersSchema = {
+	type: 'array',
+	items: {
+		type: 'object',
+		properties: {
+			metadata: _filterProps,
+			message: _filterProps,
+			properties: _filterProps,
+		},
+		additionalProperties: false,
+	},
+};
+
+const _pinSchema = {
+	type: 'object',
+	properties: {
+		mq: {
+			type: 'object',
+			properties: {
+				subscribers: {
+					type: 'array',
+					items: {
+						type: 'object',
+						properties: {
+							name: { type: 'string' },
+							attributes: {
+								type: 'array',
+								items: {
+									type: 'string',
+								},
+							},
+							settings: {
 								type: 'object',
 								properties: {
-									'field-name': { type: 'string' },
-									'expected-value': { type: 'string' },
-									operation: { type: 'string' },
+									storageOnDemand: { type: 'boolean' },
+									overloadStrategy: { type: 'string' },
+									queueLength: { type: 'string' },
 								},
 								additionalProperties: false,
-								required: ['field-name', 'expected-value', 'operation'],
 							},
+							linkTo: {
+								type: 'array',
+								items: {
+									type: 'object',
+									properties: {
+										box: { type: 'string' },
+										pin: { type: 'string' },
+										additionalProperties: false,
+										required: ['box', 'pin'],
+									},
+								},
+							},
+							filters: _filtersSchema,
+							additionalProperties: false,
+							required: ['name'],
+						},
+					},
+				},
+				publishers: {
+					type: 'array',
+					items: {
+						type: 'object',
+						properties: {
+							name: { type: 'string' },
+							attributes: {
+								type: 'array',
+								items: {
+									type: 'string',
+								},
+							},
+							filters: _filtersSchema,
+							additionalProperties: false,
+							required: ['name'],
 						},
 					},
-					additionalProperties: false,
-					required: ['metadata'],
 				},
 			},
-			attributes: {
-				type: 'array',
-				items: {
-					type: 'string',
+		},
+		grpc: {
+			type: 'object',
+			properties: {
+				server: {
+					type: 'array',
+					items: {
+						type: 'object',
+						properties: {
+							name: { type: 'string' },
+							serviceClasses: {
+								type: 'array',
+								items: {
+									type: 'string',
+								},
+							},
+							additionalProperties: false,
+							required: ['name'],
+						},
+					},
 				},
+				client: {
+					type: 'array',
+					items: {
+						type: 'object',
+						properties: {
+							name: { type: 'string' },
+							serviceClass: { type: 'string' },
+							strategy: { type: 'string' },
+							linkTo: {
+								type: 'array',
+								items: {
+									type: 'object',
+									properties: {
+										box: { type: 'string' },
+										pin: { type: 'string' },
+										additionalProperties: false,
+										required: ['box', 'pin'],
+									},
+								},
+							},
+							attributes: {
+								type: 'array',
+								items: {
+									type: 'string',
+								},
+							},
+							filters: {
+								type: 'array',
+								items: {
+									type: 'object',
+									properties: {
+										properties: _filterProps,
+									},
+									additionalProperties: false,
+								},
+							},
+							additionalProperties: false,
+							required: ['name'],
+						},
+					},
+				},
+				additionalProperties: false,
 			},
 		},
 		additionalProperties: false,
-		required: ['name', 'connection-type'],
 	},
 };
 
 const _extenedSettingsSchema = {
 	type: 'object',
 	properties: {
+		nodeName: { type: 'string' },
+		sharedMemory: {
+			type: 'object',
+			properties: {
+				enabled: { type: 'boolean' },
+			},
+			additionalProperties: false,
+			required: ['enabled'],
+		},
+		replicas: { type: 'string' },
+		k8sProbes: { type: 'boolean' },
 		service: {
 			type: 'object',
 			properties: {
 				enabled: { type: 'boolean' },
-				type: { type: 'string' },
-				endpoints: {
+				nodePort: {
 					type: 'array',
 					items: {
 						type: 'object',
 						properties: {
 							name: { type: 'string' },
-							targetPort: { type: 'number' },
-							nodePort: { type: 'number' },
+							exposedPort: { type: 'number' },
+							containerPort: { type: 'number' },
 						},
 						additionalProperties: false,
-						required: ['name', 'targetPort', 'nodePort'],
+						required: ['name', 'exposedPort'],
+					},
+				},
+				clusterIP: {
+					type: 'array',
+					items: {
+						type: 'object',
+						properties: { name: { type: 'string' }, containerPort: { type: 'number' } },
+						additionalProperties: false,
+						required: ['name'],
 					},
 				},
 				ingress: {
 					type: 'object',
 					properties: {
-						urlPathes: {
+						urlPaths: {
 							type: 'array',
 							items: {
 								type: 'string',
 							},
 						},
 					},
-					additionalProperties: false,
-					required: ['urlPathes'],
 				},
 			},
 			additionalProperties: false,
-			required: ['enabled', 'type', 'endpoints', 'ingress'],
+			required: ['enabled'],
 		},
 		envVariables: {
 			type: 'object',
@@ -120,7 +255,6 @@ const _extenedSettingsSchema = {
 						cpu: { type: 'string' },
 					},
 					additionalProperties: false,
-					required: ['cpu', 'memory'],
 				},
 				requests: {
 					type: 'object',
@@ -129,15 +263,56 @@ const _extenedSettingsSchema = {
 						cpu: { type: 'string' },
 					},
 					additionalProperties: false,
-					required: ['cpu', 'memory'],
 				},
 			},
 			additionalProperties: false,
-			required: ['limits', 'requests'],
+		},
+		externalBox: {
+			type: 'object',
+			properties: {
+				enabled: { type: 'boolean' },
+				address: { type: 'string' },
+				endpoints: {
+					type: 'array',
+					items: {
+						type: 'object',
+						properties: {
+							name: { type: 'string' },
+							targetPort: { type: 'string' },
+							port: { type: 'string' },
+						},
+						additionalProperties: false,
+						required: ['name', 'targetPort'],
+					},
+				},
+			},
+			additionalProperties: false,
+		},
+		hostAliases: {
+			type: 'array',
+			items: {
+				type: 'object',
+				properties: {
+					ip: { type: 'boolean' },
+					hostnames: { type: 'array', items: { type: 'string' } },
+				},
+				additionalProperties: false,
+			},
+		},
+		hostNetwork: { type: 'boolean' },
+		mounting: {
+			type: 'array',
+			items: {
+				type: 'object',
+				properties: {
+					path: { type: 'string' },
+					pvcName: { type: 'string' },
+				},
+				additionalProperties: false,
+			},
 		},
 	},
 	additionalProperties: false,
-	required: ['service', 'envVariables', 'resources'],
 };
 
 const getSchemaURI = (schema: any): string => {
diff --git a/src/stores/BoxUpdater.ts b/src/stores/BoxUpdater.ts
index ff1c81e..42dcd81 100644
--- a/src/stores/BoxUpdater.ts
+++ b/src/stores/BoxUpdater.ts
@@ -28,7 +28,7 @@ import {
 import { action, computed, makeObservable, observable, toJS } from 'mobx';
 import { IBoxConnections, IPinConnections } from '../components/links/BoxConnections';
 import { convertToExtendedLink } from '../helpers/link';
-import { BoxEntity, ExtendedConnectionOwner, isBoxEntity } from '../models/Box';
+import { BoxEntity, ExtendedConnectionOwner, getPins, isBoxEntity } from '../models/Box';
 import FileBase from '../models/FileBase';
 import {
 	ConnectionDirection,
@@ -126,7 +126,7 @@ export class BoxUpdater {
 			link => link[direction]?.box === box.name && boxesMap[link[oppositeDirection]?.box || ''],
 		);
 		const connectedPins = connectedLinks.map(link => link[direction]?.pin);
-		const pins = (box.spec.pins || []).filter(pin => connectedPins.includes(pin.name));
+		const pins = getPins(box.spec.pins).filter(pin => connectedPins.includes(pin.name));
 
 		let boxes: IPinConnections[] =
 			currentDepth === depth
diff --git a/src/stores/SchemaStore.ts b/src/stores/SchemaStore.ts
index cc5c4d8..d3feb15 100644
--- a/src/stores/SchemaStore.ts
+++ b/src/stores/SchemaStore.ts
@@ -26,7 +26,7 @@ import { SelectedDictionaryStore } from './SelectedDictionaryStore';
 import HistoryStore from './HistoryStore';
 import { isDictionaryEntity } from '../models/Dictionary';
 import { RootStore } from './RootStore';
-import { isBoxEntity } from '../models/Box';
+import { getPins, isBoxEntity } from '../models/Box';
 import SubscriptionStore from './SubscriptionStore';
 import { chain } from 'lodash';
 import { InvalidLink } from '../helpers/pinConnections';
@@ -92,7 +92,6 @@ export class SchemaStore {
 		this.rootStore.notificationsStore.addMessage(error);
 	};
 
-	
 	public checkBoxExistingByName = (boxName: string) => {
 		return this.boxesStore.boxes.find(_box => _box.name === boxName) !== undefined;
 	};
@@ -103,7 +102,9 @@ export class SchemaStore {
 			...this.dictionaryLinksStore.dictionaryLinksEntity,
 			spec: {
 				...this.dictionaryLinksStore.dictionaryLinksEntity.spec,
-				'multi-dictionaries-relation': this.dictionaryLinksStore.dictionaryLinksEntity.spec['multi-dictionaries-relation']
+				'multi-dictionaries-relation': this.dictionaryLinksStore.dictionaryLinksEntity.spec[
+					'multi-dictionaries-relation'
+				]
 					.filter(relation => this.checkBoxExistingByName(relation.box))
 					.map(link => {
 						return {
@@ -118,7 +119,7 @@ export class SchemaStore {
 			},
 		};
 		this.requestsStore.saveEntityChanges(this.dictionaryLinksStore.dictionaryLinksEntity, 'update');
-	}
+	};
 
 	public get invalidLinks(): InvalidLink[] {
 		const invalidLinks: InvalidLink[] = [];
@@ -137,7 +138,7 @@ export class SchemaStore {
 						box: i === 0 ? link.from?.box || '' : link.to?.box || '',
 					});
 				} else {
-					const pins = box.spec.pins?.find(
+					const pins = getPins(box.spec.pins).find(
 						pin => pin.name === (i === 0 ? link.from?.pin : link.to?.pin),
 					);
 					if (pins === undefined) {
@@ -257,7 +258,7 @@ export class SchemaStore {
 			await this.selectSchema(schema);
 			this.selectEntityFromURLParams();
 		} else if (this.schemas.length > 0) {
-			this.selectSchema(this.schemas[0]);
+			this.selectSchema(this.schemas[1]);
 		}
 	}
 }