diff --git a/src/components/1-atoms/Autocomplete.jsx b/src/components/1-atoms/Autocomplete.jsx
index 063b3fe..fbece12 100644
--- a/src/components/1-atoms/Autocomplete.jsx
+++ b/src/components/1-atoms/Autocomplete.jsx
@@ -28,7 +28,8 @@ const Autocomplete = (props) => {
         isMultiple = false,
         ignoreReset = false,
         label,
-        fullWidth,
+        fixedWidth = false,
+        ...rest
     } = props;
 
     const matchMultipleOptions = useCallback(
@@ -66,17 +67,7 @@ const Autocomplete = (props) => {
     );
 
     const classes = useStyles({
-        labelLength:
-            inputValue.length +
-            (isMultiple
-                ? selectedOption.reduce(
-                      (accLength, currentValue) =>
-                          accLength + currentValue.label.length,
-                      0
-                  )
-                : 0),
-        selectedOptions: isMultiple ? value.length : 0,
-        fullWidth: fullWidth,
+        inputLength: fixedWidth ? undefined : inputValue.length,
     });
 
     const [updateFlag, setUpdateFlag] = useState(false);
@@ -184,6 +175,7 @@ const Autocomplete = (props) => {
                     style={{ width: 'fit-content' }}
                 />
             )}
+            {...rest}
         />
     );
 };
@@ -204,7 +196,7 @@ Autocomplete.propTypes = {
     error: PropTypes.bool,
     ignoreReset: PropTypes.bool,
     label: PropTypes.string,
-    fullWidth: PropTypes.bool,
+    fixedWidth: PropTypes.bool,
 };
 
 export default Autocomplete;
diff --git a/src/components/1-atoms/AutocompleteStyles.js b/src/components/1-atoms/AutocompleteStyles.js
index a01e6ef..91114e9 100644
--- a/src/components/1-atoms/AutocompleteStyles.js
+++ b/src/components/1-atoms/AutocompleteStyles.js
@@ -7,16 +7,13 @@
 
 import makeStyles from '@mui/styles/makeStyles';
 
-const FONT_SIZE = '0.875em';
+const FONT_SIZE = 0.875; // em
 const MINIMUM_WIDTH = '150px';
 export const useStyles = makeStyles((theme) => ({
-    inputWidth: ({ labelLength, selectedOptions, fullWidth }) => {
-        return {
-            width: fullWidth
-                ? '100%'
-                : `max(${MINIMUM_WIDTH},calc(${FONT_SIZE} * ${labelLength} + 80px * ${selectedOptions} +  ${
-                      selectedOptions !== 0 ? 1 : 0
-                  } * 50px))`,
-        };
-    },
+    inputWidth: ({ inputLength }) => ({
+        minWidth: MINIMUM_WIDTH,
+        width: inputLength
+            ? `calc(${inputLength} * ${FONT_SIZE} * 16px)`
+            : 'auto',
+    }),
 }));
diff --git a/src/components/1-atoms/buttons/index.jsx b/src/components/1-atoms/buttons/index.jsx
index 3c66f26..aeb99bb 100644
--- a/src/components/1-atoms/buttons/index.jsx
+++ b/src/components/1-atoms/buttons/index.jsx
@@ -17,6 +17,7 @@ import LoopIcon from '@mui/icons-material/Loop';
 import RestartAltIcon from '@mui/icons-material/RestartAlt';
 import DoneIcon from '@mui/icons-material/Done';
 import DoneAllIcon from '@mui/icons-material/DoneAll';
+import SaveAsIcon from '@mui/icons-material/SaveAs';
 
 export const AddIconButton = (props) => (
     <IconButton icon={<AddCircleIcon />} {...props} />
@@ -55,3 +56,6 @@ export const ApplyOneButton = (props) => (
 export const ApplyAllButton = (props) => (
     <IconButton icon={<DoneAllIcon />} {...props} />
 );
+export const EditButton = (props) => (
+    <IconButton icon={<SaveAsIcon />} {...props} />
+);
diff --git a/src/components/2-molecules/AttachDialog.jsx b/src/components/2-molecules/AttachDialog.jsx
index 1f67290..4ab8f08 100644
--- a/src/components/2-molecules/AttachDialog.jsx
+++ b/src/components/2-molecules/AttachDialog.jsx
@@ -67,6 +67,7 @@ const AttachDialog = (props) => {
                                     }))}
                                     value={networkId}
                                     onChange={setNetworkId}
+                                    fixedWidth
                                 />
                             </Grid>
                             <Grid item xs={2}>
@@ -97,6 +98,7 @@ const AttachDialog = (props) => {
                             <Grid item xs={2}>
                                 <Button
                                     onClick={() => onAttach('file')}
+                                    className={classes.idVerticalAlign}
                                     disabled={file === null}
                                 >
                                     Attach
diff --git a/src/components/2-molecules/AttachDialogStyles.js b/src/components/2-molecules/AttachDialogStyles.js
index 47a7493..64f6a28 100644
--- a/src/components/2-molecules/AttachDialogStyles.js
+++ b/src/components/2-molecules/AttachDialogStyles.js
@@ -10,6 +10,7 @@ import makeStyles from '@mui/styles/makeStyles';
 export const useStyles = makeStyles({
     idVerticalAlign: {
         marginTop: '1em',
+        marginLeft: '1em',
     },
     margins: {
         padding: '1em',
diff --git a/src/components/2-molecules/ModelSelect.jsx b/src/components/2-molecules/ModelSelect.jsx
index b1d339a..1eb0fcb 100644
--- a/src/components/2-molecules/ModelSelect.jsx
+++ b/src/components/2-molecules/ModelSelect.jsx
@@ -1,91 +1,33 @@
-import { Box, Checkbox, Grid, Typography } from '@mui/material';
+/**
+ * Copyright (c) 2021, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Box, Grid, Typography } from '@mui/material';
 import Select from '../1-atoms/Select';
 import { getModelsOptions } from '../../utils/optionsBuilders';
 import { useStyles } from './ModelSelectStyle';
-import React, { useEffect, useState } from 'react';
+import React from 'react';
 import PropTypes from 'prop-types';
-import { SetType } from '../../constants/models';
-import { SaveButton } from '../1-atoms/buttons';
 
 const modelLabel = 'should be mapped to';
-const setLabel = 'and use parameters group';
-const editGroupLabel = 'Edit the parameters group and/or the parameters sets';
-const simpledEditLabel =
-    'Cannot edit sets without enabling parameters management';
-const newGroupLabel = 'Create new group';
-const isAbsoluteLabel = 'All equipments share the same .par file';
-
-const parName = (type, name) =>
-    (type === SetType.SUFFIX ? '{id}' : '') +
-    name +
-    (type === SetType.PREFIX ? '{id}' : '');
 
 const ModelSelect = (props) => {
-    const {
-        model,
-        models,
-        changeModel,
-        setGroup,
-        groupType,
-        changeGroup,
-        editGroup,
-        controlledParameters = false,
-        isNetworkAttached,
-    } = props;
-    const mappedModel = models.find(
-        (modelToTest) => modelToTest.name === model
-    );
-
-    const groups = mappedModel ? mappedModel.groups : [];
-
-    const foundGroup = mappedModel?.groups.find(
-        (group) => group.name === setGroup && group.type === groupType
-    );
-
-    const [isAbsolute, setIsAbsolute] = useState(
-        ![SetType.PREFIX, SetType.SUFFIX].includes(groupType)
-    );
+    const { model, models, changeModel } = props;
 
-    useEffect(() => {
-        // Update isAbsolute according to the group type for the rule
-        if (groupType) {
-            setIsAbsolute(
-                ![SetType.PREFIX, SetType.SUFFIX].includes(groupType)
-            );
-        }
-    }, [groupType]);
-
-    const onAbsoluteChange = () => {
-        setIsAbsolute(!isAbsolute);
-        changeGroup({ name: '', type: '' });
-    };
-    const groupOptions = groups
-        .filter((group) =>
-            isAbsolute
-                ? group.type === SetType.FIXED
-                : group.type !== SetType.FIXED
-        )
-        .map((group) => ({
-            label: parName(group.type, group.name),
-            value: group,
-        }));
-    groupOptions.push({ label: newGroupLabel, value: '' });
-
-    const errorInParams =
-        controlledParameters &&
-        (foundGroup === undefined || foundGroup.setsNumber === 0);
-
-    const classes = useStyles({ errorInParams });
+    const classes = useStyles();
 
     return (
         <Box className={classes.box}>
             <Grid container justify={'center'}>
-                <Grid item xs="auto">
+                <Grid item xs={6}>
                     <Grid container justify={'center'}>
                         <Grid item xs="auto">
                             <Typography variant="h4">{`${modelLabel} :`}</Typography>
                         </Grid>
-                        <Grid item xs="auto" className={classes.titleSelect}>
+                        <Grid item xs className={classes.titleSelect}>
                             <Select
                                 options={getModelsOptions(models)}
                                 value={model}
@@ -94,50 +36,6 @@ const ModelSelect = (props) => {
                             />
                         </Grid>
                     </Grid>
-                    <Grid container justify={'center'}>
-                        <Grid item xs="auto">
-                            <Typography variant="h4">{`${isAbsoluteLabel} :`}</Typography>
-                        </Grid>
-                        <Grid item xs="auto">
-                            <Checkbox
-                                checked={isAbsolute}
-                                onChange={onAbsoluteChange}
-                                disabled={!isNetworkAttached}
-                            />
-                        </Grid>
-                    </Grid>
-                    <Grid container justify={'center'}>
-                        <Grid item xs="auto">
-                            <Typography variant="h4">{`${setLabel} :`}</Typography>
-                        </Grid>
-                        <Grid item xs="auto" className={classes.titleSelect}>
-                            <Select
-                                options={groupOptions}
-                                value={foundGroup}
-                                setValue={changeGroup}
-                                error={foundGroup === undefined}
-                            />
-                        </Grid>
-                    </Grid>
-                </Grid>
-                <Grid item xs={2}>
-                    <Grid container className={classes.infoGrid}>
-                        <Grid item xs={3} className={classes.tooltip}></Grid>
-                        <Grid item xs={9} className={classes.button}>
-                            <SaveButton
-                                onClick={editGroup(isAbsolute)}
-                                disabled={
-                                    model === '' ||
-                                    (setGroup && !controlledParameters)
-                                }
-                                tooltip={
-                                    setGroup && !controlledParameters
-                                        ? simpledEditLabel
-                                        : editGroupLabel
-                                }
-                            />
-                        </Grid>
-                    </Grid>
                 </Grid>
             </Grid>
         </Box>
@@ -146,14 +44,8 @@ const ModelSelect = (props) => {
 
 ModelSelect.propTypes = {
     model: PropTypes.string.isRequired,
-    setGroup: PropTypes.string.isRequired,
-    groupType: PropTypes.string.isRequired,
     models: PropTypes.arrayOf(PropTypes.object).isRequired,
     changeModel: PropTypes.func.isRequired,
-    changeGroup: PropTypes.func.isRequired,
-    editGroup: PropTypes.func.isRequired,
-    controlledParameters: PropTypes.bool,
-    isNetworkAttached: PropTypes.bool.isRequired,
 };
 
 export default ModelSelect;
diff --git a/src/components/2-molecules/ModelSelectStyle.js b/src/components/2-molecules/ModelSelectStyle.js
index bbaa20b..1d14bfb 100644
--- a/src/components/2-molecules/ModelSelectStyle.js
+++ b/src/components/2-molecules/ModelSelectStyle.js
@@ -8,23 +8,8 @@
 import makeStyles from '@mui/styles/makeStyles';
 
 export const useStyles = makeStyles((theme) => ({
-    titleSelect: {},
-    box: {},
-    infoGrid: {
-        height: '100%',
-    },
-    tooltip: {
-        marginTop: '3em',
-        justifyContent: 'center',
-        display: 'flex',
+    titleSelect: {
+        textAlign: 'right',
     },
-    button: ({ errorInParams }) => ({
-        justifyContent: 'center',
-        display: 'flex',
-        '& .MuiIconButton-root .MuiIconButton-label .MuiSvgIcon-root': {
-            fontSize: '2em',
-            pointerEvents: 'auto',
-            color: errorInParams ? 'red' : 'unset',
-        },
-    }),
+    box: {},
 }));
diff --git a/src/components/2-molecules/SetGroupSelect.jsx b/src/components/2-molecules/SetGroupSelect.jsx
new file mode 100644
index 0000000..ccbd4da
--- /dev/null
+++ b/src/components/2-molecules/SetGroupSelect.jsx
@@ -0,0 +1,149 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { Box, Checkbox, Grid, Typography } from '@mui/material';
+import Select from '../1-atoms/Select';
+import { useStyles } from './SetGroupSelectStyle';
+import React, { useEffect, useState } from 'react';
+import PropTypes from 'prop-types';
+import { SetType } from '../../constants/models';
+import { EditButton } from '../1-atoms/buttons';
+
+const setLabel = 'and use parameters group';
+const editGroupLabel = 'Edit the parameters group and/or the parameters sets';
+const simpledEditLabel =
+    'Cannot edit sets without enabling parameters management';
+const newGroupLabel = 'Create new group';
+const isAbsoluteLabel = 'All equipments share the same .par file';
+
+const parName = (type, name) =>
+    (type === SetType.SUFFIX ? '{id}' : '') +
+    name +
+    (type === SetType.PREFIX ? '{id}' : '');
+
+const SetGroupSelect = (props) => {
+    const {
+        model,
+        models,
+        setGroup,
+        groupType,
+        changeGroup,
+        editGroup,
+        controlledParameters = false,
+        isNetworkAttached,
+    } = props;
+    const mappedModel = models.find(
+        (modelToTest) => modelToTest.name === model
+    );
+
+    const groups = mappedModel ? mappedModel.groups : [];
+
+    const foundGroup = mappedModel?.groups.find(
+        (group) => group.name === setGroup && group.type === groupType
+    );
+
+    const [isAbsolute, setIsAbsolute] = useState(
+        ![SetType.PREFIX, SetType.SUFFIX].includes(groupType)
+    );
+
+    useEffect(() => {
+        // Update isAbsolute according to the group type for the rule
+        if (groupType) {
+            setIsAbsolute(
+                ![SetType.PREFIX, SetType.SUFFIX].includes(groupType)
+            );
+        }
+    }, [groupType]);
+
+    const onAbsoluteChange = () => {
+        setIsAbsolute(!isAbsolute);
+        changeGroup({ name: '', type: '' });
+    };
+    const groupOptions = groups
+        .filter((group) =>
+            isAbsolute
+                ? group.type === SetType.FIXED
+                : group.type !== SetType.FIXED
+        )
+        .map((group) => ({
+            label: parName(group.type, group.name),
+            value: group,
+        }));
+    groupOptions.push({ label: newGroupLabel, value: '' });
+
+    const errorInParams =
+        controlledParameters &&
+        (foundGroup === undefined || foundGroup.setsNumber === 0);
+
+    const classes = useStyles({ errorInParams });
+
+    return (
+        <Box className={classes.box}>
+            <Grid container justify={'center'}>
+                <Grid item xs={6}>
+                    <Grid container justify={'center'}>
+                        <Grid item xs="auto">
+                            <Typography variant="h4">{`${isAbsoluteLabel} :`}</Typography>
+                        </Grid>
+                        <Grid item container xs justifyContent={'flex-end'}>
+                            <Checkbox
+                                checked={isAbsolute}
+                                onChange={onAbsoluteChange}
+                                disabled={!isNetworkAttached}
+                            />
+                        </Grid>
+                    </Grid>
+                    <Grid container justify={'center'}>
+                        <Grid item xs="auto">
+                            <Typography variant="h4">{`${setLabel} :`}</Typography>
+                        </Grid>
+                        <Grid item xs className={classes.titleSelect}>
+                            <Select
+                                options={groupOptions}
+                                value={foundGroup}
+                                setValue={changeGroup}
+                                error={foundGroup === undefined}
+                            />
+                        </Grid>
+                    </Grid>
+                </Grid>
+                <Grid
+                    item
+                    xs={1}
+                    className={classes.button}
+                    alignItems={'flex-end'}
+                >
+                    <EditButton
+                        onClick={editGroup(isAbsolute)}
+                        disabled={
+                            model === '' || (setGroup && !controlledParameters)
+                        }
+                        tooltip={
+                            setGroup && !controlledParameters
+                                ? simpledEditLabel
+                                : editGroupLabel
+                        }
+                        sx={{ marginBottom: 1 }}
+                    />
+                </Grid>
+            </Grid>
+        </Box>
+    );
+};
+
+SetGroupSelect.propTypes = {
+    model: PropTypes.string.isRequired,
+    models: PropTypes.arrayOf(PropTypes.object).isRequired,
+    setGroup: PropTypes.string.isRequired,
+    groupType: PropTypes.string.isRequired,
+    changeGroup: PropTypes.func.isRequired,
+    editGroup: PropTypes.func.isRequired,
+    controlledParameters: PropTypes.bool,
+    isNetworkAttached: PropTypes.bool.isRequired,
+};
+
+export default SetGroupSelect;
diff --git a/src/components/2-molecules/SetGroupSelectStyle.js b/src/components/2-molecules/SetGroupSelectStyle.js
new file mode 100644
index 0000000..d4b4b1a
--- /dev/null
+++ b/src/components/2-molecules/SetGroupSelectStyle.js
@@ -0,0 +1,24 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import makeStyles from '@mui/styles/makeStyles';
+
+export const useStyles = makeStyles((theme) => ({
+    titleSelect: {
+        textAlign: 'right',
+    },
+    box: {},
+    button: ({ errorInParams }) => ({
+        justifyContent: 'center',
+        display: 'flex',
+        '& .MuiIconButton-root .MuiIconButton-label .MuiSvgIcon-root': {
+            fontSize: '2em',
+            pointerEvents: 'auto',
+            color: errorInParams ? 'red' : 'unset',
+        },
+    }),
+}));
diff --git a/src/components/3-organisms/Automaton.jsx b/src/components/3-organisms/Automaton.jsx
index dcdd0a2..2a189c5 100644
--- a/src/components/3-organisms/Automaton.jsx
+++ b/src/components/3-organisms/Automaton.jsx
@@ -11,38 +11,35 @@ import Select from '../1-atoms/Select';
 import { CopyButton, DeleteButton } from '../1-atoms/buttons';
 import { Grid, Paper, Typography } from '@mui/material';
 import { getAutomatonFamiliesOptions } from '../../utils/optionsBuilders';
-import Autocomplete from '../1-atoms/Autocomplete';
 import { useStyles } from './AutomatonStyle';
-import { getAutomatonProperty } from '../../utils/automata';
 import ModelSelect from '../2-molecules/ModelSelect';
 import { SetType } from '../../constants/models';
+import AutomatonProperties from './automaton/AutomatonProperties';
+import SetGroupSelect from '../2-molecules/SetGroupSelect';
 
 const Automaton = (props) => {
     const {
         automaton,
         isAutomatonValid = true,
         changeFamily,
-        changeWatchedElement,
         changeModel,
         changeParameters,
         changeProperty,
         models,
-        networkIds = [],
+        networkPropertyValues = [],
         deleteAutomaton,
         copyAutomaton,
         editGroup = () => {},
         controlledParameters = false,
         isNetworkAttached = false,
     } = props;
-    const { family, watchedElement, model, setGroup, properties } = automaton;
+    const { family, model, setGroup } = automaton;
     const classes = useStyles(isAutomatonValid);
     // TODO intl
     const automatonLabel = 'Automaton';
     const deleteAutomatonLabel = 'Delete automaton';
     const copyAutomatonLabel = 'Copy automaton';
     const familyLabel = 'Of Family';
-    const watchedElementLabel = 'On equipment';
-    const propertiesLabel = 'Additional properties';
 
     const onChangeProperty = (propertyName) => (propertyValue) => {
         changeProperty({ name: propertyName, value: propertyValue });
@@ -66,10 +63,10 @@ const Automaton = (props) => {
                 </Grid>
             </Grid>
             <Grid container justify={'flex-start'}>
-                <Grid item xs="auto" className={classes.label}>
+                <Grid item xs={2} className={classes.label}>
                     <Typography>{`${familyLabel} :`}</Typography>
                 </Grid>
-                <Grid item xs="auto" className={classes.select}>
+                <Grid item xs={4} className={classes.select}>
                     <Select
                         options={getAutomatonFamiliesOptions()}
                         value={family}
@@ -77,71 +74,21 @@ const Automaton = (props) => {
                         error={family === ''}
                     />
                 </Grid>
+                <Grid item xs></Grid>
             </Grid>
-            <Grid container justify={'flex-start'}>
-                <Grid item xs="auto" className={classes.label}>
-                    <Typography>{`${watchedElementLabel} :`}</Typography>
-                </Grid>
-                <Grid item xs="auto" className={classes.value}>
-                    <Autocomplete
-                        isFree
-                        value={watchedElement}
-                        onChange={changeWatchedElement}
-                        options={networkIds}
-                        error={watchedElement === ''}
-                    />
-                </Grid>
-            </Grid>
-            {properties.length > 0 && (
-                <Grid container justify={'flex-start'}>
-                    <Grid item xs="auto" className={classes.label}>
-                        <Typography>{`${propertiesLabel} :`}</Typography>
-                    </Grid>
-                </Grid>
-            )}
-            {properties.map((property) => {
-                const modelProperty = getAutomatonProperty(
-                    family,
-                    property.name
-                );
-                return (
-                    <Grid container justify={'flex-start'} key={property.name}>
-                        <Grid item xs={1} />
-                        <Grid item xs="auto" className={classes.label}>
-                            <Typography>{`${property.name} :`}</Typography>
-                        </Grid>
-                        <Grid item xs="auto" className={classes.value}>
-                            <Autocomplete
-                                isFree={
-                                    !(
-                                        modelProperty?.values &&
-                                        modelProperty?.values?.length > 0
-                                    )
-                                }
-                                value={property.value}
-                                onChange={onChangeProperty(property.name)}
-                                options={modelProperty?.values}
-                                type={
-                                    modelProperty?.type === 'number'
-                                        ? 'number'
-                                        : undefined
-                                }
-                                error={property.value === ''}
-                                ignoreReset={
-                                    !(
-                                        modelProperty?.values &&
-                                        modelProperty?.values?.length > 0
-                                    )
-                                }
-                            />
-                        </Grid>
-                    </Grid>
-                );
-            })}
             <ModelSelect
                 model={model}
                 models={models}
                 changeModel={changeModel}
+            />
+            <AutomatonProperties
+                automaton={automaton}
+                networkPropertyValues={networkPropertyValues}
+                onChangeProperty={onChangeProperty}
+            />
+            <SetGroupSelect
+                model={model}
+                models={models}
                 setGroup={setGroup}
                 groupType={SetType.FIXED}
                 changeGroup={changeParameters}
@@ -157,12 +104,11 @@ Automaton.propTypes = {
     automaton: PropTypes.object.isRequired,
     isAutomatonValid: PropTypes.bool,
     changeFamily: PropTypes.func.isRequired,
-    changeWatchedElement: PropTypes.func.isRequired,
     changeModel: PropTypes.func.isRequired,
     changeParameters: PropTypes.func.isRequired,
     changeProperty: PropTypes.func.isRequired,
     models: PropTypes.array.isRequired,
-    networkIds: PropTypes.array,
+    networkPropertyValues: PropTypes.array,
     deleteAutomaton: PropTypes.func.isRequired,
     copyAutomaton: PropTypes.func.isRequired,
     editGroup: PropTypes.func.isRequired,
diff --git a/src/components/3-organisms/AutomatonStyle.js b/src/components/3-organisms/AutomatonStyle.js
index 21d6164..b296609 100644
--- a/src/components/3-organisms/AutomatonStyle.js
+++ b/src/components/3-organisms/AutomatonStyle.js
@@ -23,21 +23,13 @@ export const useStyles = makeStyles((theme) => ({
         },
     }),
     label: {
-        textAlign: 'right',
+        textAlign: 'left',
         marginTop: '12px',
         '& .MuiTypography-root': {
             fontWeight: 'bold',
         },
     },
-    value: {
-        margin: '8px',
-        '& .MuiFormControl-root .MuiInput-root': {
-            minHeight: '2em',
-            '& .MuiSelect-root': {
-                paddingTop: 0,
-                paddingBottom: 0,
-            },
-        },
+    select: {
+        textAlign: 'right',
     },
-    select: {},
 }));
diff --git a/src/components/3-organisms/Filter.jsx b/src/components/3-organisms/Filter.jsx
index b84378d..04d8f2d 100644
--- a/src/components/3-organisms/Filter.jsx
+++ b/src/components/3-organisms/Filter.jsx
@@ -12,10 +12,10 @@ import * as _ from 'lodash';
 import { CopyButton, DeleteButton } from '../1-atoms/buttons';
 import Select from '../1-atoms/Select';
 import { getOperandsOptions } from '../../utils/optionsBuilders';
-import { PropertyType } from '../../constants/equipmentDefinition';
 import { multipleOperands } from '../../constants/operands';
 import { useStyles } from './FilterStyle';
 import Autocomplete from '../1-atoms/Autocomplete';
+import { PropertyType } from '../../constants/equipmentType';
 
 const COPY_FILTER_LABEL = 'Copy filter';
 const DELETE_FILTER_LABEL = 'Delete filter';
@@ -125,8 +125,14 @@ const Filter = (props) => {
                     </Grid>
                 </Grid>
             </Grid>
-            <Grid item xs={2}>
-                <Grid container justify="center">
+            <Grid
+                item
+                xs={2}
+                container
+                justifyContent={'center'}
+                alignItems={'center'}
+            >
+                <Grid container justifyContent="flex-end">
                     <Grid item xs="auto">
                         <DeleteButton
                             onClick={deleteFilter}
diff --git a/src/components/3-organisms/Rule.jsx b/src/components/3-organisms/Rule.jsx
index dc55685..67af5bb 100644
--- a/src/components/3-organisms/Rule.jsx
+++ b/src/components/3-organisms/Rule.jsx
@@ -16,9 +16,10 @@ import {
 } from '../1-atoms/buttons';
 import { Grid, Paper, TextField, Tooltip, Typography } from '@mui/material';
 import ErrorIcon from '@mui/icons-material/Error';
-import { getEquipmentTypesOptions } from '../../utils/optionsBuilders';
+import { getRuleEquipmentTypesOptions } from '../../utils/optionsBuilders';
 import { useStyles } from './RuleStyle';
 import ModelSelect from '../2-molecules/ModelSelect';
+import SetGroupSelect from '../2-molecules/SetGroupSelect';
 
 const Rule = (props) => {
     const {
@@ -57,8 +58,8 @@ const Rule = (props) => {
     const filterLabel = 'Where';
     const addFilterLabel = 'Add filter';
     const addFilterGroupLabel = 'Add filter group';
-    const deleteRuleLabel = 'Delete rule';
-    const copyRuleLabel = 'Copy Rule';
+    const deleteRuleLabel = 'Delete model';
+    const copyRuleLabel = 'Copy model';
     const useBasicModeLabel = 'Use simple filters mode';
     const useAdvancedModeLabel = 'Use advanced filters mode';
     const unusedFiltersLabel = 'You have unused filter(s)';
@@ -79,7 +80,7 @@ const Rule = (props) => {
                         </Grid>
                         <Grid item className={classes.titleSelect}>
                             <Select
-                                options={getEquipmentTypesOptions()}
+                                options={getRuleEquipmentTypesOptions()}
                                 value={type}
                                 setValue={changeType}
                                 error={type === ''}
@@ -156,10 +157,14 @@ const Rule = (props) => {
 
             <ModelSelect
                 model={mappedModel}
-                setGroup={setGroup}
-                groupType={groupType}
                 models={models}
                 changeModel={changeModel}
+            />
+            <SetGroupSelect
+                model={mappedModel}
+                models={models}
+                setGroup={setGroup}
+                groupType={groupType}
                 changeGroup={changeParameters}
                 editGroup={editGroup}
                 controlledParameters={controlledParameters}
diff --git a/src/components/3-organisms/SetEditor.jsx b/src/components/3-organisms/SetEditor.jsx
index b71cc24..fe7cb60 100644
--- a/src/components/3-organisms/SetEditor.jsx
+++ b/src/components/3-organisms/SetEditor.jsx
@@ -59,11 +59,15 @@ const SetEditor = (props) => {
                         (param) => param.name === definition.name
                     );
                     return (
-                        <Grid container justify="space-evenly">
-                            <Grid item xs={5}>
+                        <Grid
+                            container
+                            justify="space-evenly"
+                            sx={{ padding: '8px 0px' }}
+                        >
+                            <Grid item xs={7}>
                                 <Typography>{definition.name}</Typography>
                             </Grid>
-                            <Grid item xs={5}>
+                            <Grid item xs={4}>
                                 <TextField
                                     id={definition.name}
                                     value={
@@ -85,9 +89,16 @@ const SetEditor = (props) => {
                                         definition.origin !==
                                         ParameterOrigin.USER
                                     }
+                                    sx={{ width: '100%' }}
                                 />
                             </Grid>
-                            <Grid item xs={1}>
+                            <Grid
+                                item
+                                xs
+                                container
+                                alignItems={'center'}
+                                justifyContent={'center'}
+                            >
                                 <Tooltip
                                     title={infoTypeLabel + definition.type}
                                 >
diff --git a/src/components/3-organisms/SetGroupEditor.jsx b/src/components/3-organisms/SetGroupEditor.jsx
index 5e903bf..b2c08ce 100644
--- a/src/components/3-organisms/SetGroupEditor.jsx
+++ b/src/components/3-organisms/SetGroupEditor.jsx
@@ -30,10 +30,10 @@ const SetGroupEditor = (props) => {
     return (
         <>
             <Grid container>
-                <Grid item xs="auto">
+                <Grid item xs>
                     <Typography> {`${nameLabel} :`}</Typography>
                 </Grid>
-                <Grid item xs="8">
+                <Grid item xs={8}>
                     <TextField
                         autoFocus
                         margin="dense"
@@ -48,7 +48,7 @@ const SetGroupEditor = (props) => {
             </Grid>
             {!isAbsolute && (
                 <Grid container>
-                    <Grid item xs="auto">
+                    <Grid item xs>
                         <Typography> {`${typeLabel} :`} </Typography>
                     </Grid>
                     <Grid item xs={8}>
diff --git a/src/components/3-organisms/automaton/AutomatonProperties.js b/src/components/3-organisms/automaton/AutomatonProperties.js
new file mode 100644
index 0000000..62a9e04
--- /dev/null
+++ b/src/components/3-organisms/automaton/AutomatonProperties.js
@@ -0,0 +1,113 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import React from 'react';
+import PropTypes from 'prop-types';
+import { Divider, Grid, Paper, Typography } from '@mui/material';
+import Autocomplete from '../../1-atoms/Autocomplete';
+import { useStyles } from './AutomatonPropertiesStyle';
+import {
+    getAutomatonPropertiesByModel,
+    getPossibleOptionsForProperty,
+} from '../../../utils/automata';
+
+const AutomatonProperties = ({
+    automaton,
+    networkPropertyValues,
+    onChangeProperty = () => {},
+}) => {
+    const classes = useStyles();
+
+    const automatonProperties =
+        getAutomatonPropertiesByModel(automaton?.model) ?? {};
+    const propertyNames = Object.keys(automatonProperties);
+
+    return (
+        propertyNames?.length > 0 && (
+            <Paper className={classes.group}>
+                {propertyNames.map((propertyName, index) => {
+                    const propertyDefinition =
+                        automatonProperties[propertyName];
+                    const propertyValue = automaton[propertyName];
+                    const options =
+                        propertyDefinition?.values ??
+                        (propertyDefinition?.mapping &&
+                            getPossibleOptionsForProperty(
+                                propertyDefinition?.mapping,
+                                networkPropertyValues
+                            )) ??
+                        [];
+
+                    return (
+                        <Grid container key={propertyName}>
+                            <Grid container item justify={'flex-start'} xs={6}>
+                                <Grid container>
+                                    <Grid item xs={4} className={classes.label}>
+                                        <Typography>{`${propertyDefinition.label} :`}</Typography>
+                                    </Grid>
+                                    <Grid item xs={8} className={classes.value}>
+                                        <Autocomplete
+                                            isFree={
+                                                !(options && options.length > 0)
+                                            }
+                                            isMultiple={
+                                                propertyDefinition.multiple
+                                            }
+                                            value={
+                                                propertyValue ??
+                                                (propertyDefinition.multiple
+                                                    ? []
+                                                    : propertyValue)
+                                            }
+                                            onChange={onChangeProperty(
+                                                propertyName
+                                            )}
+                                            options={options}
+                                            type={
+                                                propertyDefinition?.type ===
+                                                'number'
+                                                    ? 'number'
+                                                    : undefined
+                                            }
+                                            error={
+                                                propertyValue === '' ||
+                                                (Array.isArray(propertyValue) &&
+                                                    propertyValue.length === 0)
+                                            }
+                                            ignoreReset={
+                                                !(options && options.length > 0)
+                                            }
+                                            fixedWidth
+                                        />
+                                    </Grid>
+                                </Grid>
+                                {index !== propertyNames.length - 1 && (
+                                    <Grid
+                                        item
+                                        xs={12}
+                                        sx={{ paddingRight: '8px' }}
+                                    >
+                                        <Divider />
+                                    </Grid>
+                                )}
+                            </Grid>
+                            <Grid item xs></Grid>
+                        </Grid>
+                    );
+                })}
+            </Paper>
+        )
+    );
+};
+
+AutomatonProperties.propTypes = {
+    automaton: PropTypes.object,
+    networkPropertyValues: PropTypes.array,
+    onChangeProperty: PropTypes.func,
+};
+
+export default AutomatonProperties;
diff --git a/src/components/3-organisms/automaton/AutomatonPropertiesStyle.js b/src/components/3-organisms/automaton/AutomatonPropertiesStyle.js
new file mode 100644
index 0000000..181f427
--- /dev/null
+++ b/src/components/3-organisms/automaton/AutomatonPropertiesStyle.js
@@ -0,0 +1,30 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import makeStyles from '@mui/styles/makeStyles';
+export const useStyles = makeStyles((theme) => ({
+    label: {
+        textAlign: 'left',
+        marginTop: '12px',
+        '& .MuiTypography-root': {
+            fontWeight: 'bold',
+        },
+    },
+    value: {
+        padding: '8px 8px',
+        '& .MuiFormControl-root .MuiInput-root': {
+            minHeight: '2em',
+            '& .MuiSelect-root': {
+                paddingTop: 0,
+                paddingBottom: 0,
+            },
+        },
+    },
+    group: {
+        backgroundColor: 'rgba(255, 255, 255, 0.16)',
+    },
+}));
diff --git a/src/constants/automaton/index.js b/src/constants/automaton/index.js
new file mode 100644
index 0000000..9b8d3a5
--- /dev/null
+++ b/src/constants/automaton/index.js
@@ -0,0 +1,20 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import TapChangerBlockingAutomatonModel from './model/TapChangerBlockingAutomatonModel';
+import CurrentLimitAutomatonModel from './model/CurrentLimitAutomatonModel';
+
+export const CommonAutomatonModelGroupPlugins = [
+    {
+        id: 'TapChangerBlockingAutomatonModel',
+        model: TapChangerBlockingAutomatonModel,
+    },
+    {
+        id: 'CurrentLimitAutomatonModel',
+        model: CurrentLimitAutomatonModel,
+    },
+];
diff --git a/src/constants/automaton/model/CurrentLimitAutomatonModel.js b/src/constants/automaton/model/CurrentLimitAutomatonModel.js
new file mode 100644
index 0000000..5134cc9
--- /dev/null
+++ b/src/constants/automaton/model/CurrentLimitAutomatonModel.js
@@ -0,0 +1,37 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { EquipmentType, PropertyType } from '../../equipmentType';
+
+const CurrentLimitAutomatonModel = {
+    CurrentLimitAutomaton: {
+        watchedElement: {
+            type: PropertyType.STRING,
+            label: 'On equipment',
+            mapping: {
+                equipmentType: [EquipmentType.LINE],
+                equipmentProperty: 'id',
+            },
+        },
+        side: {
+            type: PropertyType.STRING,
+            label: 'Side',
+            values: [
+                {
+                    value: 'Branch.Side.ONE',
+                    label: 'One',
+                },
+                {
+                    value: 'Branch.Side.TWO',
+                    label: 'Two',
+                },
+            ],
+        },
+    },
+};
+
+export default CurrentLimitAutomatonModel;
diff --git a/src/constants/automaton/model/TapChangerBlockingAutomatonModel.js b/src/constants/automaton/model/TapChangerBlockingAutomatonModel.js
new file mode 100644
index 0000000..8a4ba2b
--- /dev/null
+++ b/src/constants/automaton/model/TapChangerBlockingAutomatonModel.js
@@ -0,0 +1,41 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { EquipmentType, PropertyType } from '../../equipmentType';
+
+const TapChangerBlockingAutomatonModel = {
+    TapChangerBlockingAutomaton: {
+        name: {
+            type: PropertyType.STRING,
+            label: 'Name',
+        },
+        uMeasurements: {
+            type: PropertyType.STRING,
+            label: 'U Measurement',
+            mapping: {
+                equipmentType: [EquipmentType.BUS],
+                equipmentProperty: 'id',
+            },
+            max: 5,
+            multiple: true,
+        },
+        transformers: {
+            type: PropertyType.STRING,
+            label: 'Transformers',
+            mapping: {
+                equipmentType: [
+                    EquipmentType.LOAD,
+                    EquipmentType.TWO_WINDINGS_TRANSFORMER,
+                ],
+                equipmentProperty: 'id',
+            },
+            multiple: true,
+        },
+    },
+};
+
+export default TapChangerBlockingAutomatonModel;
diff --git a/src/constants/automatonDefinition.js b/src/constants/automatonDefinition.js
new file mode 100644
index 0000000..3637558
--- /dev/null
+++ b/src/constants/automatonDefinition.js
@@ -0,0 +1,22 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+import { CommonAutomatonModelGroupPlugins } from './automaton';
+import { ExtendedAutomatonModelGroupPlugins } from '../plugins';
+
+export const AutomatonFamily = {
+    CURRENT_LIMIT: 'CURRENT_LIMIT',
+    VOLTAGE: 'VOLTAGE',
+};
+Object.freeze(AutomatonFamily);
+
+export const AutomatonProperties = {
+    ...CommonAutomatonModelGroupPlugins.concat(
+        ExtendedAutomatonModelGroupPlugins
+    ).reduce((obj, plugin) => ({ ...obj, ...plugin.model }), {}),
+};
+Object.freeze(AutomatonProperties);
diff --git a/src/constants/equipmentDefinition.js b/src/constants/equipmentDefinition.js
index d040c90..8baca48 100644
--- a/src/constants/equipmentDefinition.js
+++ b/src/constants/equipmentDefinition.js
@@ -5,22 +5,10 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-export const EquipmentType = {
-    GENERATOR: 'GENERATOR',
-    LOAD: 'LOAD',
-};
-Object.freeze(EquipmentType);
-
-export const PropertyType = {
-    STRING: 'STRING',
-    BOOLEAN: 'BOOLEAN',
-    NUMBER: 'NUMBER',
-    ENUM: 'ENUM',
-};
-Object.freeze(PropertyType);
+import { EquipmentType, PropertyType } from './equipmentType';
 
 export const EquipmentProperties = {
-    GENERATOR: [
+    [EquipmentType.GENERATOR]: [
         {
             name: 'energySource',
             type: PropertyType.ENUM,
@@ -77,7 +65,7 @@ export const EquipmentProperties = {
             type: PropertyType.NUMBER,
         },
     ],
-    LOAD: [
+    [EquipmentType.LOAD]: [
         {
             name: 'loadType',
             type: PropertyType.ENUM,
@@ -120,27 +108,3 @@ export const EquipmentProperties = {
     ],
 };
 Object.freeze(EquipmentProperties);
-
-export const AutomatonFamily = {
-    CURRENT_LIMIT: 'CURRENT_LIMIT',
-};
-Object.freeze(AutomatonFamily);
-
-export const AutomatonProperties = {
-    CURRENT_LIMIT: {
-        side: {
-            type: 'string',
-            values: [
-                {
-                    value: 'Branch.Side.ONE',
-                    label: 'One',
-                },
-                {
-                    value: 'Branch.Side.TWO',
-                    label: 'Two',
-                },
-            ],
-        },
-    },
-};
-Object.freeze(AutomatonProperties);
diff --git a/src/constants/equipmentType.js b/src/constants/equipmentType.js
new file mode 100644
index 0000000..00501a9
--- /dev/null
+++ b/src/constants/equipmentType.js
@@ -0,0 +1,26 @@
+/**
+ * Copyright (c) 2023, RTE (http://www.rte-france.com)
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ */
+
+export const EquipmentType = {
+    GENERATOR: 'GENERATOR',
+    LOAD: 'LOAD',
+    BUS: 'BUS',
+    LINE: 'LINE',
+    TWO_WINDINGS_TRANSFORMER: 'TWO_WINDINGS_TRANSFORMER',
+};
+Object.freeze(EquipmentType);
+
+export const RuleEquipmentTypes = [EquipmentType.GENERATOR, EquipmentType.LOAD];
+Object.freeze(RuleEquipmentTypes);
+
+export const PropertyType = {
+    STRING: 'STRING',
+    BOOLEAN: 'BOOLEAN',
+    NUMBER: 'NUMBER',
+    ENUM: 'ENUM',
+};
+Object.freeze(PropertyType);
diff --git a/src/containers/AutomatonContainer.jsx b/src/containers/AutomatonContainer.jsx
index 750d34b..f2195de 100644
--- a/src/containers/AutomatonContainer.jsx
+++ b/src/containers/AutomatonContainer.jsx
@@ -15,7 +15,7 @@ import {
 import { makeGetModels } from '../redux/slices/Model';
 import {
     getCurrentNetworkId,
-    makeGetPossibleWatchedElements,
+    makeGetPropertyValues,
 } from '../redux/slices/Network';
 import PropTypes from 'prop-types';
 import Automaton from '../components/3-organisms/Automaton';
@@ -24,20 +24,19 @@ import { GroupEditionOrigin, SetType } from '../constants/models';
 const AutomatonContainer = ({ index, editParameters }) => {
     const getAutomaton = useMemo(makeGetAutomaton, []);
     const automaton = useSelector((state) => getAutomaton(state, index));
-    const { model, family, setGroup } = automaton;
+    const { model, setGroup } = automaton;
     const isAutomatonValidSelector = useMemo(makeIsAutomatonValid, []);
     const isAutomatonValid = useSelector((state) =>
         isAutomatonValidSelector(state, index)
     );
     const getModels = useMemo(makeGetModels, []);
     const models = useSelector((state) => getModels(state, automaton.family));
-    const getPossibleWatchedElements = useMemo(
-        makeGetPossibleWatchedElements,
-        []
-    );
-    const networkIds = useSelector((state) =>
-        getPossibleWatchedElements(state, family)
+
+    const getPropertyValues = useMemo(makeGetPropertyValues, []);
+    const networkPropertyValues = useSelector((state) =>
+        getPropertyValues(state)
     );
+
     const controlledParameters = useSelector(
         (state) => state.mappings.controlledParameters
     );
@@ -51,13 +50,6 @@ const AutomatonContainer = ({ index, editParameters }) => {
                 family: newFamily,
             })
         );
-    const changeWatchedElement = (newWatchedElement) =>
-        dispatch(
-            MappingSlice.actions.changeAutomatonWatchedElement({
-                index,
-                watchedElement: newWatchedElement,
-            })
-        );
 
     const changeProperty = (property) =>
         dispatch(
@@ -145,12 +137,11 @@ const AutomatonContainer = ({ index, editParameters }) => {
             automaton={automaton}
             isAutomatonValid={isAutomatonValid}
             changeFamily={changeFamily}
-            changeWatchedElement={changeWatchedElement}
             changeModel={changeModel}
             changeParameters={changeParameters}
             changeProperty={changeProperty}
             models={models}
-            networkIds={networkIds}
+            networkPropertyValues={networkPropertyValues}
             deleteAutomaton={deleteAutomaton}
             copyAutomaton={copyAutomaton}
             editGroup={editGroup}
diff --git a/src/containers/FilterContainer.jsx b/src/containers/FilterContainer.jsx
index 03f0dd8..a92b0e1 100644
--- a/src/containers/FilterContainer.jsx
+++ b/src/containers/FilterContainer.jsx
@@ -18,8 +18,8 @@ import { getPropertiesOptions } from '../utils/optionsBuilders';
 import Filter from '../components/3-organisms/Filter';
 import { getProperty, getValuesOption } from '../utils/properties';
 import PropTypes from 'prop-types';
-import { PropertyType } from '../constants/equipmentDefinition';
 import { multipleOperands } from '../constants/operands';
+import { PropertyType } from '../constants/equipmentType';
 
 const FilterContainer = ({ ruleIndex, filterIndex, equipmentType }) => {
     // Data
diff --git a/src/containers/MappingContainer.jsx b/src/containers/MappingContainer.jsx
index c3690cd..3eddaf6 100644
--- a/src/containers/MappingContainer.jsx
+++ b/src/containers/MappingContainer.jsx
@@ -40,22 +40,20 @@ import RuleContainer from './RuleContainer';
 import Header from '../components/2-molecules/Header';
 import AttachDialog from '../components/2-molecules/AttachDialog';
 import FilterBar from '../components/2-molecules/FilterBar';
-import {
-    AutomatonFamily,
-    EquipmentType,
-} from '../constants/equipmentDefinition';
 import ExpandMoreIcon from '@mui/icons-material/ExpandMore';
 import { AddIconButton } from '../components/1-atoms/buttons';
 import AutomatonContainer from './AutomatonContainer';
 import ParametersContainer from './ParametersContainer';
 import { areParametersValid as areParametersValidSelector } from '../redux/selectors';
+import { AutomatonFamily } from '../constants/automatonDefinition';
+import { RuleEquipmentTypes } from '../constants/equipmentType';
 
 // TODO intl
-const ADD_RULE_LABEL = 'Add a rule';
+const ADD_MODEL_LABEL = 'Add a model';
 const CONVERT_LABEL = 'Convert to script';
 const SAVE_LABEL = 'Save Mapping';
 const ATTACH_LABEL = 'Attach a Network';
-const RULES_TITLE = 'Rules';
+const MODELS_TITLE = 'Models';
 const AUTOMATA_TITLE = 'Automata';
 const ADD_AUTOMATON_LABEL = 'Add an automaton';
 const CONTROLLED_PARAMETERS_LABEL = 'Manage model parameters';
@@ -92,7 +90,7 @@ const MappingContainer = () => {
     const [isAttachedModalOpen, setIsAttachedModalOpen] = useState(false);
     const [editParameters, setEditParameters] = useState(undefined);
 
-    const filterRulesOptions = Object.values(EquipmentType).map((type) => ({
+    const filterRulesOptions = RuleEquipmentTypes.map((type) => ({
         value: type,
         // TODO: intl
         label: `${type} (${sortedRulesNumber[type]})`,
@@ -203,7 +201,7 @@ const MappingContainer = () => {
                 </Grid>
                 <Accordion>
                     <AccordionSummary expandIcon={<ExpandMoreIcon />}>
-                        <Typography>{RULES_TITLE}</Typography>
+                        <Typography>{MODELS_TITLE}</Typography>
                     </AccordionSummary>
                     <Divider />
                     <AccordionDetails style={{ display: 'inherit' }}>
@@ -218,7 +216,7 @@ const MappingContainer = () => {
                             <Grid item xs={1}>
                                 <AddIconButton
                                     onClick={addRule}
-                                    tooltip={ADD_RULE_LABEL}
+                                    tooltip={ADD_MODEL_LABEL}
                                 />
                             </Grid>
                         </Grid>
diff --git a/src/plugins/index.js b/src/plugins/index.js
index ea13df1..0d392bd 100644
--- a/src/plugins/index.js
+++ b/src/plugins/index.js
@@ -1 +1,3 @@
 // This file will contains exported plugin collections
+
+export const ExtendedAutomatonModelGroupPlugins = [];
diff --git a/src/redux/slices/Mapping.js b/src/redux/slices/Mapping.js
index 5be8afe..bd8d38c 100644
--- a/src/redux/slices/Mapping.js
+++ b/src/redux/slices/Mapping.js
@@ -15,11 +15,6 @@ import * as _ from 'lodash';
 import RequestStatus from '../../constants/RequestStatus';
 import { getProperty } from '../../utils/properties';
 import { multipleOperands } from '../../constants/operands';
-import {
-    AutomatonFamily,
-    AutomatonProperties,
-    EquipmentType,
-} from '../../constants/equipmentDefinition';
 import {
     checkCompositionArrayValidity,
     convertCompositionArrayToString,
@@ -29,6 +24,12 @@ import {
 import * as networkAPI from '../../rest/networkAPI';
 import { makeGetNetworkValues } from './Network';
 import { createParameterSelector } from '../selectorUtil';
+import { getAutomatonPropertiesByModel } from '../../utils/automata';
+import {
+    AutomatonFamily,
+    AutomatonProperties,
+} from '../../constants/automatonDefinition';
+import { RuleEquipmentTypes } from '../../constants/equipmentType';
 
 const initialState = {
     mappings: [],
@@ -54,10 +55,8 @@ const DEFAULT_RULE = {
 
 const DEFAULT_AUTOMATON = {
     family: '',
-    watchedElement: '',
     model: '',
     setGroup: '',
-    properties: [],
 };
 
 export const DEFAULT_NAME = 'default';
@@ -88,25 +87,22 @@ const transformMapping = (receivedMapping) => {
     } else {
         mapping['automata'] = receivedMapping.automata.map(
             (receivedAutomaton) => {
-                const {
-                    family,
-                    watchedElement,
-                    model,
-                    setGroup,
-                    ...additionalProperties
-                } = receivedAutomaton;
-                return {
-                    family,
-                    watchedElement,
-                    model,
-                    setGroup,
-                    properties: Object.keys(additionalProperties).map(
-                        (propertyKey) => ({
-                            name: propertyKey,
-                            value: additionalProperties[propertyKey],
-                        })
-                    ),
-                };
+                const { family, model, setGroup, ...otherProperties } =
+                    receivedAutomaton;
+
+                // init transformed automaton with basic attributes
+                const automaton = { family, model, setGroup };
+
+                // set properties depending on model
+                const propertiesNames = Object.keys(
+                    getAutomatonPropertiesByModel(model) ?? {}
+                );
+                propertiesNames.forEach((modelPropertyName) => {
+                    automaton[modelPropertyName] =
+                        otherProperties[modelPropertyName];
+                });
+
+                return automaton;
             }
         );
     }
@@ -151,7 +147,7 @@ const getFilterIndexParam = createParameterSelector(({ filter }) => filter);
 
 export const getSortedRulesNumber = (state) => {
     let sortedRulesNumber = {};
-    Object.values(EquipmentType).forEach((type) => {
+    RuleEquipmentTypes.forEach((type) => {
         sortedRulesNumber[type] = 0;
     });
 
@@ -348,13 +344,17 @@ const checkCanUseBasicMode = (inputComposition) => {
 
 const checkAutomatonValidity = (automaton) =>
     automaton.family !== '' &&
-    automaton.watchedElement !== '' &&
     automaton.model !== '' &&
-    (automaton.properties.length === 0 ||
-        automaton.properties.reduce(
-            (acc, property) => acc && property.value !== '',
-            true
-        ));
+    automaton.setGroup !== '' &&
+    // check empty
+    Object.keys(getAutomatonPropertiesByModel(automaton.model)).reduce(
+        (acc, propertyName) =>
+            acc &&
+            ((typeof automaton[propertyName] === 'string' &&
+                automaton[propertyName] !== '') ||
+                !_.isEmpty(automaton[propertyName])),
+        true
+    );
 
 export const makeIsRuleValid = () =>
     createSelector(
@@ -506,17 +506,22 @@ export const postMapping = createAsyncThunk(
                   )?.automata
                 : state?.mappings.automata;
         const formattedAutomata = automata.map((automaton) => {
-            const { family, watchedElement, model, setGroup, properties } =
-                automaton;
+            const { family, model, setGroup } = automaton;
             const formattedAutomaton = {
                 family,
-                watchedElement,
                 model,
                 setGroup,
             };
-            properties.forEach((property) => {
-                formattedAutomaton[property.name] = property.value;
+
+            // for specific properties of model
+            const modelPropertyNames = Object.keys(
+                getAutomatonPropertiesByModel(model)
+            );
+            modelPropertyNames.forEach((modelPropertyName) => {
+                formattedAutomaton[modelPropertyName] =
+                    automaton[modelPropertyName];
             });
+
             return formattedAutomaton;
         });
 
@@ -841,13 +846,6 @@ const reducers = {
         )[index];
         selectedAutomaton.family = family;
         selectedAutomaton.model = DEFAULT_AUTOMATON.model;
-        selectedAutomaton.watchedElement = DEFAULT_AUTOMATON.watchedElement;
-        selectedAutomaton.properties = Object.keys(
-            AutomatonProperties[family] ?? {}
-        ).map((propertyName) => ({
-            name: propertyName,
-            value: '',
-        }));
     },
     changeAutomatonModel: (state, action) => {
         const { index, model } = action.payload;
@@ -856,6 +854,22 @@ const reducers = {
             state.filteredAutomatonFamily
         )[index];
         selectedAutomaton.model = model;
+
+        // clean all others automaton model properties
+        const allAutomatonProperties = Object.values(
+            AutomatonProperties
+        ).reduce(
+            (arr, propertiesDefinition) => [
+                ...arr,
+                ...Object.keys(propertiesDefinition),
+            ],
+            []
+        );
+        allAutomatonProperties.forEach(
+            (modelProperty) =>
+                (selectedAutomaton[modelProperty] =
+                    DEFAULT_AUTOMATON[modelProperty])
+        );
     },
     changeAutomatonParameters: (state, action) => {
         const { index, parameters } = action.payload;
@@ -865,26 +879,13 @@ const reducers = {
         )[index];
         selectedAutomaton.setGroup = parameters;
     },
-    changeAutomatonWatchedElement: (state, action) => {
-        const { index, watchedElement } = action.payload;
-        const selectedAutomaton = filterAutomataByFamily(
-            state.automata,
-            state.filteredAutomatonFamily
-        )[index];
-        selectedAutomaton.watchedElement = watchedElement;
-    },
     changeAutomatonPropertyValue: (state, action) => {
         const { index, property } = action.payload;
         const selectedAutomaton = filterAutomataByFamily(
             state.automata,
             state.filteredAutomatonFamily
         )[index];
-        const modifiedProperty = selectedAutomaton.properties.find(
-            (automatonProperty) => automatonProperty.name === property.name
-        );
-        if (modifiedProperty) {
-            modifiedProperty.value = property.value;
-        }
+        selectedAutomaton[property.name] = property.value;
     },
     deleteAutomaton: (state, action) => {
         const { index } = action.payload;
diff --git a/src/redux/slices/Network.js b/src/redux/slices/Network.js
index a17f983..2bb1c43 100644
--- a/src/redux/slices/Network.js
+++ b/src/redux/slices/Network.js
@@ -12,9 +12,8 @@ import {
 } from '@reduxjs/toolkit';
 import RequestStatus from '../../constants/RequestStatus';
 import * as networkAPI from '../../rest/networkAPI';
-import { PropertyType } from '../../constants/equipmentDefinition';
-import { getPossibleEquipmentTypesFromAutomatonFamily } from '../../utils/automata';
 import { createParameterSelector } from '../selectorUtil';
+import { PropertyType } from '../../constants/equipmentType';
 
 const initialState = {
     propertyValues: [],
@@ -55,25 +54,8 @@ export const makeGetNetworkValues = () =>
         getNetworkValues
     );
 
-export const makeGetPossibleWatchedElements = () =>
-    createSelector(
-        (state) => state.network.propertyValues,
-        (_state, family) => family,
-        (propertyValues, family) => {
-            const possibleTypes =
-                getPossibleEquipmentTypesFromAutomatonFamily(family);
-            const ids = [];
-            possibleTypes.forEach((possibleTime) => {
-                ids.concat(
-                    propertyValues?.find(
-                        (propertyValuesItem) =>
-                            propertyValuesItem.type === possibleTime
-                    )?.values['id'] ?? []
-                );
-            });
-            return ids;
-        }
-    );
+export const makeGetPropertyValues = () =>
+    createSelector(getPropertyValues, (propertyValues) => propertyValues);
 
 export const getCurrentNetworkId = (state) => state.network.currentNetwork;
 
@@ -114,6 +96,7 @@ export const getNetworkNames = createAsyncThunk(
 const reducers = {
     cleanNetwork: (state) => {
         state.propertyValues = [];
+        state.currentNetwork = '';
     },
 };
 
diff --git a/src/utils/automata.js b/src/utils/automata.js
index 7638c0d..e91b014 100644
--- a/src/utils/automata.js
+++ b/src/utils/automata.js
@@ -5,20 +5,30 @@
  * file, You can obtain one at http://mozilla.org/MPL/2.0/.
  */
 
-import {
-    AutomatonFamily,
-    AutomatonProperties,
-} from '../constants/equipmentDefinition';
+import { AutomatonProperties } from '../constants/automatonDefinition';
 
-export const getPossibleEquipmentTypesFromAutomatonFamily = (family) => {
-    switch (family) {
-        case AutomatonFamily.CURRENT_LIMIT:
-            return ['LINE'];
-        default:
-            return [];
-    }
+export const getAutomatonPropertiesByModel = (model) => {
+    return AutomatonProperties[model];
 };
 
-export const getAutomatonProperty = (automatonFamily, property) => {
-    return AutomatonProperties[automatonFamily][property];
+export const getPossibleOptionsForProperty = (
+    propertyMappingDefinition,
+    networkPropertyValues
+) => {
+    const possibleTypes = propertyMappingDefinition.equipmentType;
+    const possibleValues = possibleTypes.reduce(
+        (arr, possibleType) => [
+            ...arr,
+            ...(networkPropertyValues?.find(
+                (networkPropertyValues) =>
+                    networkPropertyValues.type === possibleType
+            )?.values[propertyMappingDefinition.equipmentProperty] ?? []),
+        ],
+        []
+    );
+
+    return possibleValues.map((possibleValue) => ({
+        value: possibleValue,
+        label: possibleValue,
+    }));
 };
diff --git a/src/utils/optionsBuilders.js b/src/utils/optionsBuilders.js
index e595bf5..5338d51 100644
--- a/src/utils/optionsBuilders.js
+++ b/src/utils/optionsBuilders.js
@@ -11,17 +11,14 @@ import {
     NumberOperands,
     StringOperands,
 } from '../constants/operands';
-import {
-    AutomatonFamily,
-    EquipmentProperties,
-    EquipmentType,
-    PropertyType,
-} from '../constants/equipmentDefinition';
+import { EquipmentProperties } from '../constants/equipmentDefinition';
 import { SetType } from '../constants/models';
+import { AutomatonFamily } from '../constants/automatonDefinition';
+import { PropertyType, RuleEquipmentTypes } from '../constants/equipmentType';
 
-export function getEquipmentTypesOptions() {
-    return Object.keys(EquipmentType).map((key) => {
-        const type = EquipmentType[key];
+export function getRuleEquipmentTypesOptions() {
+    return RuleEquipmentTypes.map((elem) => {
+        const type = elem;
         // TODO intl
         return { value: type, label: type };
     });