diff --git a/docs/database.md b/docs/database.md
index f3fddbd9a4d5f0e753f14b2561bf3aa1de728208..ea9d4576df3aabd49a72c822fde7e00b0e4f2948 100644
--- a/docs/database.md
+++ b/docs/database.md
@@ -1,4 +1,4 @@
-# Database
+# Configuration database
 
 ## Introduction
 
@@ -7,14 +7,116 @@ To run anis-server need at least two databases:
  - One database to store the configuration
  - At least one database containing datasets
 
-## Configuration database
+Here we will explain how the configuration database works. 
+
+## Purpose of the database
 
 Anis-server needs a database to store all the configuration : 
 
  - The available business database(s) that should contain the shared datasets.
  - The different scientific projects.
  - The shared datasets and their attributes.
- - The Access rights on datasets.
+ - The Access rights on datasets (users and roles).
 
 ## Schema
 
+![database_schema](img/metamodel_mcd.svg)
+
+## Settings
+
+By default anis-server is configured to connect to a postgres database created during the first launch of docker-compose.
+The docker compose integrates a PostgreSQL database server named `db`. 
+You can find the `docker-compose.yml` file at the root of the anis-server project.
+
+The database settings connection are given in the environment variables of the php container.
+
+![database_connection_settings.png](img/database_connection_settings.png)
+
+Here is the list of options concerning the configuration database : 
+
+- `DATABASE_DEV_MODE`: Default to `1` in development mode and to `0` in production mode
+- `DATABASE_CO_DRIVER`: PDO driver used to connect to the database
+- `DATABASE_CO_HOST`: Database server host
+- `DATABASE_CO_PORT`: Database server listening port
+- `DATABASE_CO_DBNAME`: Name of the anis-server configuration database 
+- `DATABASE_CO_USER`: User name used to connect to the anis-server configuration database
+- `DATABASE_CO_PASSWORD`: Password used to connect to the anis-server configuration database
+
+You are free to change this configuration to connect to another database.
+
+## Doctrine entities
+
+Anis server uses a tool called doctrine to generate the database from the code. 
+You can find more information on the official website: [https://www.doctrine-project.org](https://www.doctrine-project.org).
+
+Anis server stores the different doctrine entities in the `src/Entity` folder and each file corresponds to a table in the configuration database.
+
+![doctrine_entities](img/doctrine_entities.png)
+
+If you want to change the structure of the database you must edit or add entities.
+But be careful for each change you will have to re-generate the database and the doctrine proxies.
+
+## Doctrine command-line tool
+
+You can use the doctrine command-line tool to perform most of the operations.
+To run the tool you must have launched anis-server with the docker-compose file (see installation).
+
+You must be at the root of the anis-server directory.
+And you can then enter into the anis-server container by typing the following command:
+
+```bash
+$ make shell
+```
+
+Once in the container you can type the following command to execute doctrine-cli:
+
+```bash
+$ ./vendor/bin/doctrine
+```
+
+What you see are the different operations you can perform.
+
+![doctrine_cli_operations](img/doctrine_cli_operations.png)
+
+## Validate schema
+
+If you have performed operations on entities you must ensure that the database schema remains valid.
+Doctrine then proposes a command to perform that:
+
+```bash
+$ ./vendor/bin/doctrine orm:validate-schema
+```
+
+## Create database
+
+If the tables of your database are not yet generated you must ask doctrine to create them with the following command:
+
+```bash
+$ ./vendor/bin/doctrine orm:schema-tool:create
+```
+
+## Drop database
+
+If the tables of your database are already generated but you want to start from a blank database you can type the following command:
+
+```bash
+$ ./vendor/bin/doctrine orm:schema-tool:drop
+```
+
+## Update database
+
+If you have made changes to your entities you must update the database with the following command: 
+
+```bash
+$ ./vendor/bin/doctrine orm:schema-tool:update
+```
+
+## Generate proxies
+
+If you have made changes to your entities you must also update the doctrine entities proxies.
+The doctrine entities proxies are used to improve the performance of requests.
+To regenerate them type the following command:
+
+```bash
+$ ./vendor/bin/doctrine orm:generate-proxies
+```
diff --git a/docs/extra.css b/docs/extra.css
new file mode 100644
index 0000000000000000000000000000000000000000..ae79377e8ac3f30c22cc287b3233d623cebaa0fc
--- /dev/null
+++ b/docs/extra.css
@@ -0,0 +1,10 @@
+img[src*='#left'] { 
+    float: left;
+}
+img[src*='#right'] { 
+    float: right;
+}
+img[src*='#center'] { 
+    display: block; 
+    margin: auto; 
+}
\ No newline at end of file
diff --git a/docs/img/anis_v3_logo300.png b/docs/img/anis_v3_logo300.png
new file mode 100755
index 0000000000000000000000000000000000000000..50a0355b5a9b5ca9ee9017973d3e3b338af2cbf2
Binary files /dev/null and b/docs/img/anis_v3_logo300.png differ
diff --git a/docs/img/database_connection_settings.png b/docs/img/database_connection_settings.png
new file mode 100755
index 0000000000000000000000000000000000000000..df8df312cad7dc5a0a90e917ff21ea3d8c257b13
Binary files /dev/null and b/docs/img/database_connection_settings.png differ
diff --git a/docs/img/doctrine_cli_operations.png b/docs/img/doctrine_cli_operations.png
new file mode 100755
index 0000000000000000000000000000000000000000..c888ab294239f447cfc94b834b9901db2aead8da
Binary files /dev/null and b/docs/img/doctrine_cli_operations.png differ
diff --git a/docs/img/doctrine_entities.png b/docs/img/doctrine_entities.png
new file mode 100755
index 0000000000000000000000000000000000000000..5dca913f43c3193c457905dc4f6b6dd3107240bd
Binary files /dev/null and b/docs/img/doctrine_entities.png differ
diff --git a/docs/img/metamodel_mcd.svg b/docs/img/metamodel_mcd.svg
new file mode 100755
index 0000000000000000000000000000000000000000..de6c76866ac048a39a5cf0ed0b059e94fc5f2b82
--- /dev/null
+++ b/docs/img/metamodel_mcd.svg
@@ -0,0 +1,298 @@
+<?xml version="1.0" standalone="no"?>
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN"
+"http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd">
+
+<svg width="639" height="948" view_box="0 0 639 948"
+xmlns="http://www.w3.org/2000/svg"
+xmlns:link="http://www.w3.org/1999/xlink">\n\n<desc>Généré par Mocodo 2.3.7 le Wed, 31 Mar 2021 01:27:59</desc>
+
+<rect id="frame" x="0" y="0" width="639" height="948" fill="#f7f7f7" stroke="none" stroke-width="0"/>
+
+<!-- Association DF9 -->
+<line x1="313" y1="381" x2="207" y2="381" stroke="#9970ab" stroke-width="2"/>
+<text x="231" y="398.0" fill="#1b7837" font-family="Verdana" font-size="12">0,N</text>
+<line x1="66" y1="381" x2="207" y2="381" stroke="#9970ab" stroke-width="2"/>
+<text x="128" y="398.0" fill="#1b7837" font-family="Verdana" font-size="12">0,1</text>
+<g id="association-DF9">
+	<circle cx="207" cy="381" r="16" stroke="#9970ab" stroke-width="2" fill="#c2a5cf"/>
+	<text x="198" y="385.0" fill="#000000" font-family="Verdana" font-size="12">DF</text>
+</g>
+
+<!-- Association DF8 -->
+<line x1="313" y1="381" x2="416" y2="381" stroke="#9970ab" stroke-width="2"/>
+<text x="373" y="398.0" fill="#1b7837" font-family="Verdana" font-size="12">1,1</text>
+<line x1="416" y1="60" x2="416" y2="381" stroke="#9970ab" stroke-width="2"/>
+<text x="421.0" y="128" fill="#1b7837" font-family="Verdana" font-size="12">0,N</text>
+<g id="association-DF8">
+	<circle cx="416" cy="381" r="16" stroke="#9970ab" stroke-width="2" fill="#c2a5cf"/>
+	<text x="407" y="385.0" fill="#000000" font-family="Verdana" font-size="12">DF</text>
+</g>
+
+<!-- Association groups_datasets -->
+<line x1="66" y1="854" x2="207" y2="854" stroke="#9970ab" stroke-width="2"/>
+<text x="122" y="871.0" fill="#1b7837" font-family="Verdana" font-size="12">0,N</text>
+<line x1="207" y1="702" x2="207" y2="854" stroke="#9970ab" stroke-width="2"/>
+<text x="180.0" y="821" fill="#1b7837" font-family="Verdana" font-size="12">0,N</text>
+<g id="association-groups_datasets">
+	<path d="M 251 829 a 14 14 90 0 1 14 14 V 854 h -116 V 843 a 14 14 90 0 1 14 -14" fill="#c2a5cf" stroke="#c2a5cf" stroke-width="0"/>
+	<path d="M 265 854.0 v 11 a 14 14 90 0 1 -14 14 H 163 a 14 14 90 0 1 -14 -14 V 854.0 H 116" fill="#e7d4e8" stroke="#e7d4e8" stroke-width="0"/>
+	<rect x="149" y="829" width="116" height="50" fill="none" rx="14" stroke="#9970ab" stroke-width="2"/>
+	<line x1="149" y1="854" x2="265" y2="854" stroke="#9970ab" stroke-width="1"/>
+	<text x="156" y="846.7" fill="#000000" font-family="Verdana" font-size="12">groups_datasets</text>
+</g>
+
+<!-- Association DF5 -->
+<line x1="514" y1="381" x2="514" y2="702" stroke="#9970ab" stroke-width="2"/>
+<text x="519.0" y="449" fill="#1b7837" font-family="Verdana" font-size="12">0,N</text>
+<line x1="416" y1="702" x2="514" y2="702" stroke="#9970ab" stroke-width="2"/>
+<text x="471" y="719.0" fill="#1b7837" font-family="Verdana" font-size="12">1,1</text>
+<g id="association-DF5">
+	<circle cx="514" cy="702" r="16" stroke="#9970ab" stroke-width="2" fill="#c2a5cf"/>
+	<text x="505" y="706.0" fill="#000000" font-family="Verdana" font-size="12">DF</text>
+</g>
+
+<!-- Association DF4 -->
+<line x1="207" y1="702" x2="66" y2="702" stroke="#9970ab" stroke-width="2"/>
+<text x="141" y="719.0" fill="#1b7837" font-family="Verdana" font-size="12">0,N</text>
+<line x1="66" y1="381" x2="66" y2="702" stroke="#9970ab" stroke-width="2"/>
+<text x="71.0" y="678" fill="#1b7837" font-family="Verdana" font-size="12">1,1</text>
+<g id="association-DF4">
+	<circle cx="66" cy="702" r="16" stroke="#9970ab" stroke-width="2" fill="#c2a5cf"/>
+	<text x="57" y="706.0" fill="#000000" font-family="Verdana" font-size="12">DF</text>
+</g>
+
+<!-- Association DF1 -->
+<line x1="416" y1="854" x2="313" y2="854" stroke="#9970ab" stroke-width="2"/>
+<text x="350" y="871.0" fill="#1b7837" font-family="Verdana" font-size="12">0,N</text>
+<line x1="207" y1="702" x2="313" y2="854" stroke="#9970ab" stroke-width="2"/>
+<text x="251" y="755.240280154" fill="#1b7837" font-family="Verdana" font-size="12">1,1</text>
+<g id="association-DF1">
+	<circle cx="313" cy="854" r="16" stroke="#9970ab" stroke-width="2" fill="#c2a5cf"/>
+	<text x="304" y="858.0" fill="#000000" font-family="Verdana" font-size="12">DF</text>
+</g>
+
+<!-- Association DF3 -->
+<line x1="207" y1="60" x2="66" y2="60" stroke="#9970ab" stroke-width="2"/>
+<text x="131" y="77.0" fill="#1b7837" font-family="Verdana" font-size="12">0,N</text>
+<line x1="66" y1="381" x2="66" y2="60" stroke="#9970ab" stroke-width="2"/>
+<text x="71.0" y="93" fill="#1b7837" font-family="Verdana" font-size="12">0,1</text>
+<g id="association-DF3">
+	<circle cx="66" cy="60" r="16" stroke="#9970ab" stroke-width="2" fill="#c2a5cf"/>
+	<text x="57" y="64.0" fill="#000000" font-family="Verdana" font-size="12">DF</text>
+</g>
+
+<!-- Association DF2 -->
+<line x1="416" y1="702" x2="313" y2="702" stroke="#9970ab" stroke-width="2"/>
+<text x="339" y="719.0" fill="#1b7837" font-family="Verdana" font-size="12">0,N</text>
+<line x1="207" y1="702" x2="313" y2="702" stroke="#9970ab" stroke-width="2"/>
+<text x="251" y="694.0" fill="#1b7837" font-family="Verdana" font-size="12">1,1</text>
+<g id="association-DF2">
+	<circle cx="313" cy="702" r="16" stroke="#9970ab" stroke-width="2" fill="#c2a5cf"/>
+	<text x="304" y="706.0" fill="#000000" font-family="Verdana" font-size="12">DF</text>
+</g>
+
+<!-- Association DF -->
+<line x1="596" y1="854" x2="514" y2="854" stroke="#9970ab" stroke-width="2"/>
+<text x="535" y="871.0" fill="#1b7837" font-family="Verdana" font-size="12">0,N</text>
+<line x1="416" y1="854" x2="514" y2="854" stroke="#9970ab" stroke-width="2"/>
+<text x="460" y="871.0" fill="#1b7837" font-family="Verdana" font-size="12">1,1</text>
+<g id="association-DF">
+	<circle cx="514" cy="854" r="16" stroke="#9970ab" stroke-width="2" fill="#c2a5cf"/>
+	<text x="505" y="858.0" fill="#000000" font-family="Verdana" font-size="12">DF</text>
+</g>
+
+<!-- Entity group -->
+<g id="entity-group">
+	<g id="frame-group">
+		<rect x="15" y="812" width="102" height="25" fill="#a6dba0" stroke="#a6dba0" stroke-width="0"/>
+		<rect x="15" y="837.0" width="102" height="59" fill="#d9f0d3" stroke="#d9f0d3" stroke-width="0"/>
+		<rect x="15" y="812" width="102" height="84" fill="none" stroke="#5aae61" stroke-width="2"/>
+		<line x1="15" y1="837" x2="117" y2="837" stroke="#5aae61" stroke-width="1"/>
+	</g>
+	<text x="48" y="829.7" fill="#000000" font-family="Verdana" font-size="12">group</text>
+	<text x="20" y="854.8" fill="#000000" font-family="Verdana" font-size="12">id</text>
+	<line x1="20" y1="857" x2="32" y2="857" stroke="#000000" stroke-width="1"/>
+	<text x="20" y="871.8" fill="#000000" font-family="Verdana" font-size="12">role</text>
+	<text x="20" y="888.8" fill="#000000" font-family="Verdana" font-size="12">instance_name</text>
+</g>
+
+<!-- Entity output_category -->
+<g id="entity-output_category">
+	<g id="frame-output_category">
+		<rect x="258" y="339" width="110" height="25" fill="#a6dba0" stroke="#a6dba0" stroke-width="0"/>
+		<rect x="258" y="364.0" width="110" height="59" fill="#d9f0d3" stroke="#d9f0d3" stroke-width="0"/>
+		<rect x="258" y="339" width="110" height="84" fill="none" stroke="#5aae61" stroke-width="2"/>
+		<line x1="258" y1="364" x2="368" y2="364" stroke="#5aae61" stroke-width="1"/>
+	</g>
+	<text x="263" y="356.7" fill="#000000" font-family="Verdana" font-size="12">output_category</text>
+	<text x="263" y="381.8" fill="#000000" font-family="Verdana" font-size="12">id</text>
+	<line x1="263" y1="384" x2="275" y2="384" stroke="#000000" stroke-width="1"/>
+	<text x="263" y="398.8" fill="#000000" font-family="Verdana" font-size="12">label</text>
+	<text x="263" y="415.8" fill="#000000" font-family="Verdana" font-size="12">display</text>
+</g>
+
+<!-- Entity database -->
+<g id="entity-database">
+	<g id="frame-database">
+		<rect x="562" y="769" width="68" height="25" fill="#a6dba0" stroke="#a6dba0" stroke-width="0"/>
+		<rect x="562" y="794.0" width="68" height="145" fill="#d9f0d3" stroke="#d9f0d3" stroke-width="0"/>
+		<rect x="562" y="769" width="68" height="170" fill="none" stroke="#5aae61" stroke-width="2"/>
+		<line x1="562" y1="794" x2="630" y2="794" stroke="#5aae61" stroke-width="1"/>
+	</g>
+	<text x="568" y="786.7" fill="#000000" font-family="Verdana" font-size="12">database</text>
+	<text x="567" y="811.7" fill="#000000" font-family="Verdana" font-size="12">id</text>
+	<line x1="567" y1="814" x2="579" y2="814" stroke="#000000" stroke-width="1"/>
+	<text x="567" y="828.7" fill="#000000" font-family="Verdana" font-size="12">label</text>
+	<text x="567" y="845.7" fill="#000000" font-family="Verdana" font-size="12">dbname</text>
+	<text x="567" y="862.8" fill="#000000" font-family="Verdana" font-size="12">type</text>
+	<text x="567" y="879.8" fill="#000000" font-family="Verdana" font-size="12">host</text>
+	<text x="567" y="896.8" fill="#000000" font-family="Verdana" font-size="12">port</text>
+	<text x="567" y="913.8" fill="#000000" font-family="Verdana" font-size="12">login</text>
+	<text x="567" y="930.8" fill="#000000" font-family="Verdana" font-size="12">password</text>
+</g>
+
+<!-- Entity attribute -->
+<g id="entity-attribute">
+	<g id="frame-attribute">
+		<rect x="9" y="101" width="114" height="25" fill="#a6dba0" stroke="#a6dba0" stroke-width="0"/>
+		<rect x="9" y="126.0" width="114" height="535" fill="#d9f0d3" stroke="#d9f0d3" stroke-width="0"/>
+		<rect x="9" y="101" width="114" height="560" fill="none" stroke="#5aae61" stroke-width="2"/>
+		<line x1="9" y1="126" x2="123" y2="126" stroke="#5aae61" stroke-width="1"/>
+	</g>
+	<text x="39" y="118.7" fill="#000000" font-family="Verdana" font-size="12">attribute</text>
+	<text x="14" y="143.7" fill="#000000" font-family="Verdana" font-size="12">id</text>
+	<line x1="14" y1="146" x2="26" y2="146" stroke="#000000" stroke-width="1"/>
+	<text x="14" y="160.7" fill="#000000" font-family="Verdana" font-size="12">name</text>
+	<text x="14" y="177.7" fill="#000000" font-family="Verdana" font-size="12">table_name</text>
+	<text x="14" y="194.7" fill="#000000" font-family="Verdana" font-size="12">label</text>
+	<text x="14" y="211.7" fill="#000000" font-family="Verdana" font-size="12">form_label</text>
+	<text x="14" y="228.7" fill="#000000" font-family="Verdana" font-size="12">description</text>
+	<text x="14" y="245.7" fill="#000000" font-family="Verdana" font-size="12">output_display</text>
+	<text x="14" y="262.7" fill="#000000" font-family="Verdana" font-size="12">criteria_display</text>
+	<text x="14" y="279.7" fill="#000000" font-family="Verdana" font-size="12">search_flag</text>
+	<text x="14" y="296.7" fill="#000000" font-family="Verdana" font-size="12">search_type</text>
+	<text x="14" y="313.7" fill="#000000" font-family="Verdana" font-size="12">operator</text>
+	<text x="14" y="330.7" fill="#000000" font-family="Verdana" font-size="12">type</text>
+	<text x="14" y="347.7" fill="#000000" font-family="Verdana" font-size="12">min</text>
+	<text x="14" y="364.7" fill="#000000" font-family="Verdana" font-size="12">max</text>
+	<text x="14" y="381.8" fill="#000000" font-family="Verdana" font-size="12">placeholder_min</text>
+	<text x="14" y="398.8" fill="#000000" font-family="Verdana" font-size="12">placeholder_max</text>
+	<text x="14" y="415.8" fill="#000000" font-family="Verdana" font-size="12">renderer</text>
+	<text x="14" y="432.8" fill="#000000" font-family="Verdana" font-size="12">renderer_config</text>
+	<text x="14" y="449.8" fill="#000000" font-family="Verdana" font-size="12">display_detail</text>
+	<text x="14" y="466.8" fill="#000000" font-family="Verdana" font-size="12">selected</text>
+	<text x="14" y="483.8" fill="#000000" font-family="Verdana" font-size="12">order_by</text>
+	<text x="14" y="500.8" fill="#000000" font-family="Verdana" font-size="12">order_display</text>
+	<text x="14" y="517.8" fill="#000000" font-family="Verdana" font-size="12">detail</text>
+	<text x="14" y="534.8" fill="#000000" font-family="Verdana" font-size="12">renderer_detail</text>
+	<text x="14" y="551.8" fill="#000000" font-family="Verdana" font-size="12">options</text>
+	<text x="14" y="568.8" fill="#000000" font-family="Verdana" font-size="12">vo_utype</text>
+	<text x="14" y="585.8" fill="#000000" font-family="Verdana" font-size="12">vo_ucd</text>
+	<text x="14" y="602.8" fill="#000000" font-family="Verdana" font-size="12">vo_unit</text>
+	<text x="14" y="619.8" fill="#000000" font-family="Verdana" font-size="12">vo_description</text>
+	<text x="14" y="636.8" fill="#000000" font-family="Verdana" font-size="12">vo_datatype</text>
+	<text x="14" y="653.8" fill="#000000" font-family="Verdana" font-size="12">vo_size</text>
+</g>
+
+<!-- Entity dataset_family -->
+<g id="entity-dataset_family">
+	<g id="frame-dataset_family">
+		<rect x="366" y="660" width="100" height="25" fill="#a6dba0" stroke="#a6dba0" stroke-width="0"/>
+		<rect x="366" y="685.0" width="100" height="59" fill="#d9f0d3" stroke="#d9f0d3" stroke-width="0"/>
+		<rect x="366" y="660" width="100" height="84" fill="none" stroke="#5aae61" stroke-width="2"/>
+		<line x1="366" y1="685" x2="466" y2="685" stroke="#5aae61" stroke-width="1"/>
+	</g>
+	<text x="371" y="677.7" fill="#000000" font-family="Verdana" font-size="12">dataset_family</text>
+	<text x="371" y="702.8" fill="#000000" font-family="Verdana" font-size="12">id</text>
+	<line x1="371" y1="705" x2="383" y2="705" stroke="#000000" stroke-width="1"/>
+	<text x="371" y="719.8" fill="#000000" font-family="Verdana" font-size="12">label</text>
+	<text x="371" y="736.8" fill="#000000" font-family="Verdana" font-size="12">display</text>
+</g>
+
+<!-- Entity dataset -->
+<g id="entity-dataset">
+	<g id="frame-dataset">
+		<rect x="168" y="600" width="78" height="25" fill="#a6dba0" stroke="#a6dba0" stroke-width="0"/>
+		<rect x="168" y="625.0" width="78" height="179" fill="#d9f0d3" stroke="#d9f0d3" stroke-width="0"/>
+		<rect x="168" y="600" width="78" height="204" fill="none" stroke="#5aae61" stroke-width="2"/>
+		<line x1="168" y1="625" x2="246" y2="625" stroke="#5aae61" stroke-width="1"/>
+	</g>
+	<text x="184" y="617.7" fill="#000000" font-family="Verdana" font-size="12">dataset</text>
+	<text x="173" y="642.7" fill="#000000" font-family="Verdana" font-size="12">name</text>
+	<line x1="173" y1="645" x2="208" y2="645" stroke="#000000" stroke-width="1"/>
+	<text x="173" y="659.7" fill="#000000" font-family="Verdana" font-size="12">table_ref</text>
+	<text x="173" y="676.7" fill="#000000" font-family="Verdana" font-size="12">label</text>
+	<text x="173" y="693.7" fill="#000000" font-family="Verdana" font-size="12">description</text>
+	<text x="173" y="710.8" fill="#000000" font-family="Verdana" font-size="12">display</text>
+	<text x="173" y="727.8" fill="#000000" font-family="Verdana" font-size="12">count</text>
+	<text x="173" y="744.8" fill="#000000" font-family="Verdana" font-size="12">vo</text>
+	<text x="173" y="761.8" fill="#000000" font-family="Verdana" font-size="12">data_path</text>
+	<text x="173" y="778.8" fill="#000000" font-family="Verdana" font-size="12">config</text>
+	<text x="173" y="795.8" fill="#000000" font-family="Verdana" font-size="12">public</text>
+</g>
+
+<!-- Entity project -->
+<g id="entity-project">
+	<g id="frame-project">
+		<rect x="377" y="795" width="78" height="25" fill="#a6dba0" stroke="#a6dba0" stroke-width="0"/>
+		<rect x="377" y="820.0" width="78" height="93" fill="#d9f0d3" stroke="#d9f0d3" stroke-width="0"/>
+		<rect x="377" y="795" width="78" height="118" fill="none" stroke="#5aae61" stroke-width="2"/>
+		<line x1="377" y1="820" x2="455" y2="820" stroke="#5aae61" stroke-width="1"/>
+	</g>
+	<text x="394" y="812.7" fill="#000000" font-family="Verdana" font-size="12">project</text>
+	<text x="382" y="837.7" fill="#000000" font-family="Verdana" font-size="12">name</text>
+	<line x1="382" y1="840" x2="417" y2="840" stroke="#000000" stroke-width="1"/>
+	<text x="382" y="854.8" fill="#000000" font-family="Verdana" font-size="12">label</text>
+	<text x="382" y="871.8" fill="#000000" font-family="Verdana" font-size="12">description</text>
+	<text x="382" y="888.8" fill="#000000" font-family="Verdana" font-size="12">link</text>
+	<text x="382" y="905.8" fill="#000000" font-family="Verdana" font-size="12">manager</text>
+</g>
+
+<!-- Entity instance -->
+<g id="entity-instance">
+	<g id="frame-instance">
+		<rect x="483" y="330" width="62" height="25" fill="#a6dba0" stroke="#a6dba0" stroke-width="0"/>
+		<rect x="483" y="355.0" width="62" height="77" fill="#d9f0d3" stroke="#d9f0d3" stroke-width="0"/>
+		<rect x="483" y="330" width="62" height="102" fill="none" stroke="#5aae61" stroke-width="2"/>
+		<line x1="483" y1="355" x2="545" y2="355" stroke="#5aae61" stroke-width="1"/>
+	</g>
+	<text x="488" y="347.7" fill="#000000" font-family="Verdana" font-size="12">instance</text>
+	<text x="488" y="372.7" fill="#000000" font-family="Verdana" font-size="12">name</text>
+	<line x1="488" y1="375" x2="523" y2="375" stroke="#000000" stroke-width="1"/>
+	<text x="488" y="389.8" fill="#000000" font-family="Verdana" font-size="12">label</text>
+	<text x="488" y="406.8" fill="#000000" font-family="Verdana" font-size="12">clientUrl</text>
+	<text x="488" y="423.8" fill="#000000" font-family="Verdana" font-size="12">config</text>
+</g>
+
+<!-- Entity criteria_family -->
+<g id="entity-criteria_family">
+	<g id="frame-criteria_family">
+		<rect x="158" y="9" width="98" height="25" fill="#a6dba0" stroke="#a6dba0" stroke-width="0"/>
+		<rect x="158" y="34.0" width="98" height="77" fill="#d9f0d3" stroke="#d9f0d3" stroke-width="0"/>
+		<rect x="158" y="9" width="98" height="102" fill="none" stroke="#5aae61" stroke-width="2"/>
+		<line x1="158" y1="34" x2="256" y2="34" stroke="#5aae61" stroke-width="1"/>
+	</g>
+	<text x="163" y="26.7" fill="#000000" font-family="Verdana" font-size="12">criteria_family</text>
+	<text x="163" y="51.7" fill="#000000" font-family="Verdana" font-size="12">id</text>
+	<line x1="163" y1="54" x2="175" y2="54" stroke="#000000" stroke-width="1"/>
+	<text x="163" y="68.8" fill="#000000" font-family="Verdana" font-size="12">label</text>
+	<text x="163" y="85.8" fill="#000000" font-family="Verdana" font-size="12">display</text>
+	<text x="163" y="102.8" fill="#000000" font-family="Verdana" font-size="12">dataset_name</text>
+</g>
+
+<!-- Entity output_family -->
+<g id="entity-output_family">
+	<g id="frame-output_family">
+		<rect x="367" y="9" width="98" height="25" fill="#a6dba0" stroke="#a6dba0" stroke-width="0"/>
+		<rect x="367" y="34.0" width="98" height="77" fill="#d9f0d3" stroke="#d9f0d3" stroke-width="0"/>
+		<rect x="367" y="9" width="98" height="102" fill="none" stroke="#5aae61" stroke-width="2"/>
+		<line x1="367" y1="34" x2="465" y2="34" stroke="#5aae61" stroke-width="1"/>
+	</g>
+	<text x="373" y="26.7" fill="#000000" font-family="Verdana" font-size="12">output_family</text>
+	<text x="372" y="51.7" fill="#000000" font-family="Verdana" font-size="12">id</text>
+	<line x1="372" y1="54" x2="384" y2="54" stroke="#000000" stroke-width="1"/>
+	<text x="372" y="68.8" fill="#000000" font-family="Verdana" font-size="12">label</text>
+	<text x="372" y="85.8" fill="#000000" font-family="Verdana" font-size="12">display</text>
+	<text x="372" y="102.8" fill="#000000" font-family="Verdana" font-size="12">dataset_name</text>
+</g>
+</svg>
\ No newline at end of file
diff --git a/docs/index.md b/docs/index.md
index 0019b4f3386f75ffdf7eb9abec857de776db1715..13f5f7917b174fe8a6479193a6ae59822c567298 100644
--- a/docs/index.md
+++ b/docs/index.md
@@ -1,5 +1,7 @@
 # Welcome to the ANIS Documentation
 
+![anis_v3_logo](img/anis_v3_logo300.png#center)
+
 ## Introduction
 
 Welcome to the AstroNomical Information System user's manual.  
@@ -38,7 +40,7 @@ under French law and abiding by the rules of distribution of free software.
 
 You can use, modify and/ or redistribute the software under the terms of the CeCILL
 license as circulated by CEA, CNRS and INRIA at the following URL
-[https://cecill.info](https://cecill.info) and / or below.
+[https://cecill.info](https://cecill.info/index.en.html).
 
 ## Authors
 
diff --git a/mkdocs.yml b/mkdocs.yml
index a35e26230865399c7a437959f544e54146fcdd3b..e04c21d5093c1b8e68b12a05c7b9d041f2c55e8e 100644
--- a/mkdocs.yml
+++ b/mkdocs.yml
@@ -1,9 +1,10 @@
 site_name: ANIS Documentation
 dev_addr: 0.0.0.0:8888
 theme: readthedocs
+extra_css: [extra.css]
 nav:
     - Overview: index.md
     - Installation: installation.md
-    - Database: database.md
+    - Configuration database: database.md
     - Configuration: configuration.md
     - Search: search.md
\ No newline at end of file