diff --git a/docs/basics.md b/docs/basics.md
index c8b53ce..a0af9ae 100644
--- a/docs/basics.md
+++ b/docs/basics.md
@@ -4,6 +4,8 @@ Manta commands have a nomal and a short version
 
 ## List configurations
 
+A configuration is a list of layers, each being a git repository containing ansible playbooks, these playbooks will run in order to create an image or to configure nodes during runtime.
+
 List/filter the configurations in the system
 
 Normal version
@@ -64,8 +66,93 @@ manta g c -H zinal -l 2`
 +--------------------------------------------------------------+----------------------+----------------------------------------------------+
 ```
 
+If manta realise only one configuration is returned, then it will fetch extra information for each configuration layers, the example below will fetch the details of all configuration layers related to the most recent configuration created across all clusters I have access.
+
+```bash
+manta g c -m`
++--------------------------------------------+----------------------+----------------------------------------------------+--------------------------------------------------------+
+| Configuration Name                         | Last updated         | Layers                                             | Derivatives                                            |
++=================================================================================================================================================================================+
+| eiger-mc-compute-config-cscs-24.3.0.r1-0.1 | 2024-06-14T17:29:38Z | Name:     csm-packages-1.5.0                       | CFS sessions:                                          |
+|                                            |                      | Branch:   cray/csm/1.16.26                         |  - batcher-3e4e38eb-db3c-45b3-bc00-992ffe4a7792        |
+|                                            |                      | Tag:                                               |  - batcher-b5329f53-8121-49ab-b7dd-7de7f17bf4bb        |
+|                                            |                      | Date:     2024-03-22T10:54:39Z                     |                                                        |
+|                                            |                      | Author:   crayvcs - cf-gitea-import                | BOS sessiontemplates:                                  |
+|                                            |                      | Commit:   6423c550ea38a3b6befc4867ea7319157b48c554 |  - eiger-mc-compute-template-cscs-24.3.0.r1-0.1.x86_64 |
+|                                            |                      | Playbook: csm_packages.yml                         |                                                        |
+|                                            |                      |                                                    | IMS images:                                            |
+|                                            |                      | Name:     shs-cassini_install-cscs-24.3.0          |  - eiger-mc-compute-cscs-24.3.0.r1-0.1                 |
+|                                            |                      | Branch:   cscs-24.3.0cscs-24.5.0                   |                                                        |
+|                                            |                      | Tag:                                               |                                                        |
+|                                            |                      | Date:     2024-05-03T10:24:28+02:00                |                                                        |
+|                                            |                      | Author:   Riccardo Di Maria                        |                                                        |
+|                                            |                      | Commit:   4dead2f7ebd1080d6a65d4b374618cf727624215 |                                                        |
+|                                            |                      | Playbook: shs_cassini_install.yml                  |                                                        |
+|                                            |                      |                                                    |                                                        |
+|                                            |                      | Name:     cos-compute-cscs-24.3.0                  |                                                        |
+|                                            |                      | Branch:   cscs-24.3.0                              |                                                        |
+|                                            |                      | Tag:                                               |                                                        |
+|                                            |                      | Date:     2024-06-14T15:44:11+02:00                |                                                        |
+|                                            |                      | Author:   Gennaro Oliva                            |                                                        |
+|                                            |                      | Commit:   f8247821fa3c220159f31694cc995f24e07bb8f1 |                                                        |
+|                                            |                      | Playbook: cos-compute.yml                          |                                                        |
+|                                            |                      |                                                    |                                                        |
+|                                            |                      | Name:     csm-diags-compute-1.5.26                 |                                                        |
+|                                            |                      | Branch:   cray/csm-diags/1.5.26                    |                                                        |
+|                                            |                      | Tag:                                               |                                                        |
+|                                            |                      | Date:     2024-03-22T17:11:47Z                     |                                                        |
+|                                            |                      | Author:   crayvcs - cf-gitea-import                |                                                        |
+|                                            |                      | Commit:   3b59bd64682b8e55c7f49c6317442b48cea6bb53 |                                                        |
+|                                            |                      | Playbook: csm-diags-compute.yml                    |                                                        |
+|                                            |                      |                                                    |                                                        |
+|                                            |                      | Name:     sma-ldms-compute-1.9.14                  |                                                        |
+|                                            |                      | Branch:   cray/sma/1.9.14                          |                                                        |
+|                                            |                      | Tag:                                               |                                                        |
+|                                            |                      | Date:     2024-03-22T16:24:29Z                     |                                                        |
+|                                            |                      | Author:   crayvcs - cf-gitea-import                |                                                        |
+|                                            |                      | Commit:   09b922e6a608f273dd28dfbc9eaf089b355a56b8 |                                                        |
+|                                            |                      | Playbook: sma-ldms-compute.yml                     |                                                        |
+|                                            |                      |                                                    |                                                        |
+|                                            |                      | Name:     cscs                                     |                                                        |
+|                                            |                      | Branch:   cscs-24.3.0                              |                                                        |
+|                                            |                      | Tag:                                               |                                                        |
+|                                            |                      | Date:     2024-06-14T19:26:31+02:00                |                                                        |
+|                                            |                      | Author:   Gennaro Oliva                            |                                                        |
+|                                            |                      | Commit:   a58fc02eb298cd2b472c616d2ef641ee2c456181 |                                                        |
+|                                            |                      | Playbook: site.yml                                 |                                                        |
+|                                            |                      |                                                    |                                                        |
+|                                            |                      | Name:     cpe-pe_deploy-cscs-24.3.0                |                                                        |
+|                                            |                      | Branch:   cscs-24.5.0                              |                                                        |
+|                                            |                      | Tag:                                               |                                                        |
+|                                            |                      | Date:     2024-06-14T13:51:32+02:00                |                                                        |
+|                                            |                      | Author:   Gennaro Oliva                            |                                                        |
+|                                            |                      | Commit:   f9105c8172af7521910e849d274c91103bfbde75 |                                                        |
+|                                            |                      | Playbook: site-cscs.yml                            |                                                        |
+|                                            |                      |                                                    |                                                        |
+|                                            |                      | Name:     slurm-site-cscs-24.3.0                   |                                                        |
+|                                            |                      | Branch:   cscs-24.3.0                              |                                                        |
+|                                            |                      | Tag:                                               |                                                        |
+|                                            |                      | Date:     2024-06-05T15:58:19+02:00                |                                                        |
+|                                            |                      | Author:   Gennaro Oliva                            |                                                        |
+|                                            |                      | Commit:   e75324a1a35f20fda131fded61a486025fce6d41 |                                                        |
+|                                            |                      | Playbook: site-cscs.yml                            |                                                        |
+|                                            |                      |                                                    |                                                        |
+|                                            |                      | Name:     cos-compute-last-cscs-24.3.0             |                                                        |
+|                                            |                      | Branch:                                            |                                                        |
+|                                            |                      | Tag:                                               |                                                        |
+|                                            |                      | Date:     2024-06-04T18:31:44+02:00                |                                                        |
+|                                            |                      | Author:   Chris Gamboni                            |                                                        |
+|                                            |                      | Commit:   6bf3f82608686da8dbf857656f1e37c4c84054d1 |                                                        |
+|                                            |                      | Playbook: cos-compute-last.yml                     |                                                        |
++--------------------------------------------+----------------------+----------------------------------------------------+--------------------------------------------------------+
+```
+
+> Note: manta will try to resolve the `git tag` related to each `configuration layer`
+
 ## List sessions
 
+A session is an instance of a configuration to create an image or configure a compute node. When a session is created, user would expect to have an image ready to boot compute nodes or configure nodes during runtime.
+
 ## List images
 
 ## List cluster details/summary
@@ -74,11 +161,23 @@ manta g c -H zinal -l 2`
 
 ## Set runtime configuration
 
+??? info "**WIP**"
+    This is work in progress
+
 ## Set boot image
 
+??? info "**WIP**"
+    This is work in progress
+
 ???+ warning "**Highly discourage**"
-      only do this if sessions in the system has been deleted
+      Use this command only if `manta set boot-configuration` fails because it can't find the sessions linking the configuration with the image (meaning information in the system has been deleted)
 
 ## Set boot configuration
 
+??? info "**WIP**"
+    This is work in progress
+
 ## Set kernel parameters
+
+??? info "**WIP**"
+    This is work in progress
diff --git a/docs/configuration.md b/docs/configuration.md
index 8b4e541..0fe6644 100644
--- a/docs/configuration.md
+++ b/docs/configuration.md
@@ -108,5 +108,3 @@ HSM available: ["adula", "alps", "burst", "burst_gh", "burst_mc", "eiger", "fora
 Current HSM:
 Parent HSM: nodes_free
 ```
-
-