diff --git a/Simulations/051/412/051412bed812cc77b3a749ee330cd740ab78eeef/051412bed812cc77b3a749ee330cd740ab78eeef/README.yaml b/Simulations/051/412/051412bed812cc77b3a749ee330cd740ab78eeef/051412bed812cc77b3a749ee330cd740ab78eeef/README.yaml
index 2633c8e83..d5c2d2a91 100644
--- a/Simulations/051/412/051412bed812cc77b3a749ee330cd740ab78eeef/051412bed812cc77b3a749ee330cd740ab78eeef/README.yaml
+++ b/Simulations/051/412/051412bed812cc77b3a749ee330cd740ab78eeef/051412bed812cc77b3a749ee330cd740ab78eeef/README.yaml
@@ -24,7 +24,6 @@ COMPOSITION:
     NAME: TIP3
     MAPPING: mappingTIP3PCHARMMgui.yaml
     COUNT: 7200
-DIR_WRK: /media/osollila/Data1/tmp/DATABANK/
 PUBLICATION: null
 AUTHORS_CONTACT: Melcr, Josef
 SYSTEM: 80POPC_80CHOL_7200SOL_303K
@@ -34,7 +33,7 @@ FF_SOURCE: starting structure from CHARMM-GUI Membrane Builder v1.7 (http://www.
 FF_DATE: null
 CHK:
 - - step8_1.chk
-TOP:
+PSF:
 - - step5_charmm2omm.psf
 CRD:
 - - step5_charmm2omm.crd
diff --git a/Simulations/1c2/f06/1c2f06a9172359ef0e7599536966edff86498b63/1c2f06a9172359ef0e7599536966edff86498b63/README.yaml b/Simulations/1c2/f06/1c2f06a9172359ef0e7599536966edff86498b63/1c2f06a9172359ef0e7599536966edff86498b63/README.yaml
index 61c6f67b2..cd538ccae 100644
--- a/Simulations/1c2/f06/1c2f06a9172359ef0e7599536966edff86498b63/1c2f06a9172359ef0e7599536966edff86498b63/README.yaml
+++ b/Simulations/1c2/f06/1c2f06a9172359ef0e7599536966edff86498b63/1c2f06a9172359ef0e7599536966edff86498b63/README.yaml
@@ -2,8 +2,10 @@ DOI: 10.5281/zenodo.8000065
 SOFTWARE: openMM
 TRJ:
 - - traj.xtc
-PDB:
+PSF:
 - - step2_drude.psf
+PDB:
+- - step2_drude.pdb
 PREEQTIME: 200
 TIMELEFTOUT: 0
 TEMPERATURE: 303
@@ -26,14 +28,13 @@ COMPOSITION:
     NAME: CLA
     MAPPING: mappingCLAcharmmPolarizable.yaml
     COUNT: 82
-DIR_WRK: /home/peptid/drude
 PUBLICATION: null
 AUTHORS_CONTACT: Kav, Batuhan
 SYSTEM: POPC_350_CaCl2_CHARMMdrude2023_303K
 SOFTWARE_VERSION: null
-FF: Charmm-Drude polarizable2023
+FF: Charmm-Drude polarizable
 FF_SOURCE: https://doi.org/10.1021/acs.jctc.3c00203
-FF_DATE: null
+FF_DATE: 2023
 CHK: null
 TOP: null
 CRD: null
diff --git a/Simulations/1c4/77d/1c477da411113327d1c0e43eea10b0f096031d45/35a315cecf0156381237417893bf6755b08ab3e8/README.yaml b/Simulations/1c4/77d/1c477da411113327d1c0e43eea10b0f096031d45/35a315cecf0156381237417893bf6755b08ab3e8/README.yaml
index c64f6e6f8..51c8a8b69 100644
--- a/Simulations/1c4/77d/1c477da411113327d1c0e43eea10b0f096031d45/35a315cecf0156381237417893bf6755b08ab3e8/README.yaml
+++ b/Simulations/1c4/77d/1c477da411113327d1c0e43eea10b0f096031d45/35a315cecf0156381237417893bf6755b08ab3e8/README.yaml
@@ -9,14 +9,12 @@ TIMELEFTOUT: 0
 COMPOSITION:
   POPC:
     NAME: PC
-    MOLTYPE: system1
     MAPPING: mappingPOPC_AmberLipid.yaml
     COUNT:
     - 175
     - 175
   POPG:
     NAME: PGR
-    MOLTYPE: system2
     MAPPING: mappingPOPGlipid17.yaml
     COUNT:
     - 44
diff --git a/Simulations/1cc/c95/1ccc95a2fbe4eb6dc3442672820449a667b6c809/fa35f5627cf4ebe0a9d248fc0ff3b5d474181b8c/README.yaml b/Simulations/1cc/c95/1ccc95a2fbe4eb6dc3442672820449a667b6c809/fa35f5627cf4ebe0a9d248fc0ff3b5d474181b8c/README.yaml
index f3cbf4571..202482bcf 100644
--- a/Simulations/1cc/c95/1ccc95a2fbe4eb6dc3442672820449a667b6c809/fa35f5627cf4ebe0a9d248fc0ff3b5d474181b8c/README.yaml
+++ b/Simulations/1cc/c95/1ccc95a2fbe4eb6dc3442672820449a667b6c809/fa35f5627cf4ebe0a9d248fc0ff3b5d474181b8c/README.yaml
@@ -9,14 +9,12 @@ TIMELEFTOUT: 0
 COMPOSITION:
   POPC:
     NAME: PC
-    MOLTYPE: system1
     MAPPING: mappingPOPC_AmberLipid.yaml
     COUNT:
     - 75
     - 75
   POPG:
     NAME: PGR
-    MOLTYPE: system2
     MAPPING: mappingPOPGlipid17.yaml
     COUNT:
     - 76
diff --git a/Simulations/21e/025/21e0257dc453a389dfecaf1774e46253c23f4f5d/21e0257dc453a389dfecaf1774e46253c23f4f5d/README.yaml b/Simulations/21e/025/21e0257dc453a389dfecaf1774e46253c23f4f5d/21e0257dc453a389dfecaf1774e46253c23f4f5d/README.yaml
index 522562ce1..818933160 100644
--- a/Simulations/21e/025/21e0257dc453a389dfecaf1774e46253c23f4f5d/21e0257dc453a389dfecaf1774e46253c23f4f5d/README.yaml
+++ b/Simulations/21e/025/21e0257dc453a389dfecaf1774e46253c23f4f5d/21e0257dc453a389dfecaf1774e46253c23f4f5d/README.yaml
@@ -2,7 +2,7 @@ DOI: 10.5281/zenodo.7992137
 SOFTWARE: openMM
 TRJ:
 - - traj.dcd
-PDB:
+PSF:
 - - step2_drude.psf
 PREEQTIME: 200
 TIMELEFTOUT: 0
diff --git a/Simulations/244/97f/24497f8f740c4466d91660c34cb1c2295265ede5/24497f8f740c4466d91660c34cb1c2295265ede5/README.yaml b/Simulations/244/97f/24497f8f740c4466d91660c34cb1c2295265ede5/24497f8f740c4466d91660c34cb1c2295265ede5/README.yaml
index 767f3ff72..4d78ddc75 100644
--- a/Simulations/244/97f/24497f8f740c4466d91660c34cb1c2295265ede5/24497f8f740c4466d91660c34cb1c2295265ede5/README.yaml
+++ b/Simulations/244/97f/24497f8f740c4466d91660c34cb1c2295265ede5/24497f8f740c4466d91660c34cb1c2295265ede5/README.yaml
@@ -2,7 +2,7 @@ DOI: 10.5281/zenodo.7916287
 SOFTWARE: openMM
 TRJ:
 - - popc1ns.xtc
-PDB:
+PSF:
 - - popc72_drude.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
@@ -18,14 +18,13 @@ COMPOSITION:
     NAME: SWM4
     MAPPING: mappingSWM4water.yaml
     COUNT: 2239
-DIR_WRK: /home/sosamuli/temp/DataBank/
 PUBLICATION: null
 AUTHORS_CONTACT: Kav, Batuhan
 SYSTEM: POPC_CHARMMdrude2023_303K
 SOFTWARE_VERSION: null
-FF: Charmm-Drude polarizable2023
+FF: Charmm-Drude polarizable
 FF_SOURCE: null
-FF_DATE: null
+FF_DATE: 2023
 CHK: null
 TOP: null
 CRD: null
diff --git a/Simulations/25a/ce9/25ace931487aad89f9e755125358282fe99d8ea8/7ce1e2a0f5027d28b81cab28c850ef64d5c9aff5/README.yaml b/Simulations/25a/ce9/25ace931487aad89f9e755125358282fe99d8ea8/7ce1e2a0f5027d28b81cab28c850ef64d5c9aff5/README.yaml
index 7cb4ba732..db4f7506d 100644
--- a/Simulations/25a/ce9/25ace931487aad89f9e755125358282fe99d8ea8/7ce1e2a0f5027d28b81cab28c850ef64d5c9aff5/README.yaml
+++ b/Simulations/25a/ce9/25ace931487aad89f9e755125358282fe99d8ea8/7ce1e2a0f5027d28b81cab28c850ef64d5c9aff5/README.yaml
@@ -13,14 +13,12 @@ FF_SOURCE: 10.5281/zenodo.2585523
 COMPOSITION:
   POPG:
     NAME: PGR
-    MOLTYPE: system2
     COUNT:
     - 44
     - 44
     MAPPING: mappingPOPGlipid17.yaml
   POPC:
     NAME: PC
-    MOLTYPE: system1
     COUNT:
     - 175
     - 175
diff --git a/Simulations/273/eca/273eca556626ecfe2e8c9dbad5cc8b45cdf2c94b/273eca556626ecfe2e8c9dbad5cc8b45cdf2c94b/README.yaml b/Simulations/273/eca/273eca556626ecfe2e8c9dbad5cc8b45cdf2c94b/273eca556626ecfe2e8c9dbad5cc8b45cdf2c94b/README.yaml
index a49ac2c29..f266fcfe7 100644
--- a/Simulations/273/eca/273eca556626ecfe2e8c9dbad5cc8b45cdf2c94b/273eca556626ecfe2e8c9dbad5cc8b45cdf2c94b/README.yaml
+++ b/Simulations/273/eca/273eca556626ecfe2e8c9dbad5cc8b45cdf2c94b/273eca556626ecfe2e8c9dbad5cc8b45cdf2c94b/README.yaml
@@ -2,7 +2,7 @@ DOI: 10.5281/zenodo.8000095
 SOFTWARE: openMM
 TRJ:
 - - traj.xtc
-PDB:
+PSF:
 - - step2_drude.psf
 PREEQTIME: 200
 TIMELEFTOUT: 0
diff --git a/Simulations/306/0e0/3060e0da10ae3325d69b59feef3a2249b299a706/9789f36a4d076909e29a14c8cc702b794e358691/README.yaml b/Simulations/306/0e0/3060e0da10ae3325d69b59feef3a2249b299a706/9789f36a4d076909e29a14c8cc702b794e358691/README.yaml
index c2eddd84d..6e24c3cfe 100644
--- a/Simulations/306/0e0/3060e0da10ae3325d69b59feef3a2249b299a706/9789f36a4d076909e29a14c8cc702b794e358691/README.yaml
+++ b/Simulations/306/0e0/3060e0da10ae3325d69b59feef3a2249b299a706/9789f36a4d076909e29a14c8cc702b794e358691/README.yaml
@@ -9,14 +9,12 @@ TIMELEFTOUT: 0
 COMPOSITION:
   POPE:
     NAME: PE
-    MOLTYPE: system1
     MAPPING: mappingPOPE_AmberLipid.yaml
     COUNT:
     - 187
     - 187
   POPG:
     NAME: PGR
-    MOLTYPE: system2
     MAPPING: mappingPOPGlipid17.yaml
     COUNT:
     - 63
diff --git a/Simulations/50a/869/50a869e592b5cb04f2139c462da1fd7814832acd/4416de72d1d15b560aef6adf7222ea774c90b53f/README.yaml b/Simulations/50a/869/50a869e592b5cb04f2139c462da1fd7814832acd/4416de72d1d15b560aef6adf7222ea774c90b53f/README.yaml
index f67afe6cc..7dd820f98 100644
--- a/Simulations/50a/869/50a869e592b5cb04f2139c462da1fd7814832acd/4416de72d1d15b560aef6adf7222ea774c90b53f/README.yaml
+++ b/Simulations/50a/869/50a869e592b5cb04f2139c462da1fd7814832acd/4416de72d1d15b560aef6adf7222ea774c90b53f/README.yaml
@@ -9,14 +9,12 @@ TIMELEFTOUT: 0
 COMPOSITION:
   POPC:
     NAME: PC
-    MOLTYPE: system1
     MAPPING: mappingPOPC_AmberLipid.yaml
     COUNT:
     - 76
     - 74
   POPG:
     NAME: PGR
-    MOLTYPE: system2
     MAPPING: mappingPOPGlipid17.yaml
     COUNT:
     - 75
diff --git a/Simulations/549/7c7/5497c72e84f8a1d8895cf012fd0ba5e2dbb218f0/e689bf23a1b93998fb38f215c26871379a05247a/README.yaml b/Simulations/549/7c7/5497c72e84f8a1d8895cf012fd0ba5e2dbb218f0/e689bf23a1b93998fb38f215c26871379a05247a/README.yaml
index b645f5121..01b89d4d3 100644
--- a/Simulations/549/7c7/5497c72e84f8a1d8895cf012fd0ba5e2dbb218f0/e689bf23a1b93998fb38f215c26871379a05247a/README.yaml
+++ b/Simulations/549/7c7/5497c72e84f8a1d8895cf012fd0ba5e2dbb218f0/e689bf23a1b93998fb38f215c26871379a05247a/README.yaml
@@ -9,14 +9,12 @@ TIMELEFTOUT: 0
 COMPOSITION:
   POPE:
     NAME: PE
-    MOLTYPE: system1
     MAPPING: mappingPOPE_AmberLipid.yaml
     COUNT:
     - 187
     - 187
   POPG:
     NAME: PGR
-    MOLTYPE: system2
     MAPPING: mappingPOPGlipid17.yaml
     COUNT:
     - 63
diff --git a/Simulations/5e0/76b/5e076b17c45fed32bf63492301f79167dda0cc8b/5e076b17c45fed32bf63492301f79167dda0cc8b/README.yaml b/Simulations/5e0/76b/5e076b17c45fed32bf63492301f79167dda0cc8b/5e076b17c45fed32bf63492301f79167dda0cc8b/README.yaml
index 05e266080..54f056463 100644
--- a/Simulations/5e0/76b/5e076b17c45fed32bf63492301f79167dda0cc8b/5e076b17c45fed32bf63492301f79167dda0cc8b/README.yaml
+++ b/Simulations/5e0/76b/5e076b17c45fed32bf63492301f79167dda0cc8b/5e076b17c45fed32bf63492301f79167dda0cc8b/README.yaml
@@ -4,6 +4,8 @@ TRJ:
 - - traj_center.dcd
 PDB:
 - - struct.pdb
+PSF:
+- - struct.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
 TEMPERATURE: 298
@@ -32,7 +34,6 @@ COMPOSITION:
     NAME: CLA
     MAPPING: mappingCLA.yaml
     COUNT: 35
-DIR_WRK: /home/sosamuli/temp/DataBank/
 PUBLICATION: Doktorova et al. 2017 Phys. Chem. Chem. Phys. article (DOI 10.1039/c7cp01921a)
 AUTHORS_CONTACT: Milka Doktorova
 SYSTEM: POPC/PSM (70/30) NAMD
diff --git a/Simulations/68d/39e/68d39e96aca23aeaa4ea2567e0e0cb8b8903a694/68d39e96aca23aeaa4ea2567e0e0cb8b8903a694/README.yaml b/Simulations/68d/39e/68d39e96aca23aeaa4ea2567e0e0cb8b8903a694/68d39e96aca23aeaa4ea2567e0e0cb8b8903a694/README.yaml
index 1cd2850f6..ef6767d01 100644
--- a/Simulations/68d/39e/68d39e96aca23aeaa4ea2567e0e0cb8b8903a694/68d39e96aca23aeaa4ea2567e0e0cb8b8903a694/README.yaml
+++ b/Simulations/68d/39e/68d39e96aca23aeaa4ea2567e0e0cb8b8903a694/68d39e96aca23aeaa4ea2567e0e0cb8b8903a694/README.yaml
@@ -4,6 +4,8 @@ TRJ:
 - - traj_center.dcd
 PDB:
 - - struct.pdb
+PSF:
+- - struct.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
 TEMPERATURE: 328.15
@@ -18,7 +20,6 @@ COMPOSITION:
     NAME: TIP3
     MAPPING: mappingTIP3PCHARMMgui.yaml
     COUNT: 9000
-DIR_WRK: /home/sosamuli/temp/DataBank/
 PUBLICATION: Doktorova et al. 2020 J. Phys. Chem. B. article (DOI 10.1021/acs.jpcb.0c03389)
 AUTHORS_CONTACT: Milka Doktorova
 SYSTEM: PSM NAMD
diff --git a/Simulations/6a1/bbc/6a1bbc478e03fca6d1567f3d9451cfe5c8aadc72/6a1bbc478e03fca6d1567f3d9451cfe5c8aadc72/README.yaml b/Simulations/6a1/bbc/6a1bbc478e03fca6d1567f3d9451cfe5c8aadc72/6a1bbc478e03fca6d1567f3d9451cfe5c8aadc72/README.yaml
index 8a9c759d4..dcbf4f6ce 100644
--- a/Simulations/6a1/bbc/6a1bbc478e03fca6d1567f3d9451cfe5c8aadc72/6a1bbc478e03fca6d1567f3d9451cfe5c8aadc72/README.yaml
+++ b/Simulations/6a1/bbc/6a1bbc478e03fca6d1567f3d9451cfe5c8aadc72/6a1bbc478e03fca6d1567f3d9451cfe5c8aadc72/README.yaml
@@ -2,7 +2,7 @@ DOI: 10.5281/zenodo.7916494
 SOFTWARE: openMM
 TRJ:
 - - pope2ns.xtc
-PDB:
+PSF:
 - - pope72_drude.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
diff --git a/Simulations/6d9/ea1/6d9ea166a012ce72b5552c6cb9589033d9fd3edf/6d9ea166a012ce72b5552c6cb9589033d9fd3edf/README.yaml b/Simulations/6d9/ea1/6d9ea166a012ce72b5552c6cb9589033d9fd3edf/6d9ea166a012ce72b5552c6cb9589033d9fd3edf/README.yaml
index 47ee37f9e..6dd20dbe3 100644
--- a/Simulations/6d9/ea1/6d9ea166a012ce72b5552c6cb9589033d9fd3edf/6d9ea166a012ce72b5552c6cb9589033d9fd3edf/README.yaml
+++ b/Simulations/6d9/ea1/6d9ea166a012ce72b5552c6cb9589033d9fd3edf/6d9ea166a012ce72b5552c6cb9589033d9fd3edf/README.yaml
@@ -4,6 +4,8 @@ TRJ:
 - - traj_center.dcd
 PDB:
 - - struct.pdb
+PDB:
+- - struct.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
 TEMPERATURE: 303
diff --git a/Simulations/780/d37/780d3763c456a6837a6d65f48cc7e7b14e4a3a6e/780d3763c456a6837a6d65f48cc7e7b14e4a3a6e/README.yaml b/Simulations/780/d37/780d3763c456a6837a6d65f48cc7e7b14e4a3a6e/780d3763c456a6837a6d65f48cc7e7b14e4a3a6e/README.yaml
index b5e54930a..0457a4f45 100644
--- a/Simulations/780/d37/780d3763c456a6837a6d65f48cc7e7b14e4a3a6e/780d3763c456a6837a6d65f48cc7e7b14e4a3a6e/README.yaml
+++ b/Simulations/780/d37/780d3763c456a6837a6d65f48cc7e7b14e4a3a6e/780d3763c456a6837a6d65f48cc7e7b14e4a3a6e/README.yaml
@@ -2,7 +2,7 @@ DOI: 10.5281/zenodo.7916287
 SOFTWARE: openMM
 TRJ:
 - - popc3ns.xtc
-PDB:
+PSF:
 - - popc72_drude.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
@@ -18,7 +18,6 @@ COMPOSITION:
     NAME: SWM4
     MAPPING: mappingSWM4water.yaml
     COUNT: 2239
-DIR_WRK: /home/sosamuli/temp/DataBank/
 PUBLICATION: null
 AUTHORS_CONTACT: Kav, Batuhan
 SYSTEM: POPC_CHARMMdrude2023_303K
diff --git a/Simulations/7ee/0dd/7ee0dd27df2a8d15323124198450c6b1f1642702/7ee0dd27df2a8d15323124198450c6b1f1642702/README.yaml b/Simulations/7ee/0dd/7ee0dd27df2a8d15323124198450c6b1f1642702/7ee0dd27df2a8d15323124198450c6b1f1642702/README.yaml
index cf9a3d0ca..d76eb42bc 100644
--- a/Simulations/7ee/0dd/7ee0dd27df2a8d15323124198450c6b1f1642702/7ee0dd27df2a8d15323124198450c6b1f1642702/README.yaml
+++ b/Simulations/7ee/0dd/7ee0dd27df2a8d15323124198450c6b1f1642702/7ee0dd27df2a8d15323124198450c6b1f1642702/README.yaml
@@ -4,10 +4,11 @@ TRJ:
 - - ER-like.dcd
 PDB:
 - - ER-like.pdb
+PSF:
+- - ER-like.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
 TEMPERATURE: 310
-DIR_WRK: /home/sosamuli/temp/DataBank/
 PUBLICATION: null
 AUTHORS_CONTACT: Reza Talandashti and Nathalie Reuter
 SYSTEM: 12CHOL,134POPC,60POPE,14POPS,26POPI,10CER180,10551SOL,40SOD
diff --git a/Simulations/7f1/f10/7f1f101895eed0e5b5344166106a5710ce18a82c/7f1f101895eed0e5b5344166106a5710ce18a82c/README.yaml b/Simulations/7f1/f10/7f1f101895eed0e5b5344166106a5710ce18a82c/7f1f101895eed0e5b5344166106a5710ce18a82c/README.yaml
index 003c75e35..08dc72cd0 100644
--- a/Simulations/7f1/f10/7f1f101895eed0e5b5344166106a5710ce18a82c/7f1f101895eed0e5b5344166106a5710ce18a82c/README.yaml
+++ b/Simulations/7f1/f10/7f1f101895eed0e5b5344166106a5710ce18a82c/7f1f101895eed0e5b5344166106a5710ce18a82c/README.yaml
@@ -2,7 +2,7 @@ DOI: 10.5281/zenodo.7916494
 SOFTWARE: openMM
 TRJ:
 - - pope1ns.xtc
-PDB:
+PSF:
 - - pope72_drude.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
diff --git a/Simulations/80e/71c/80e71c6616d7eb421861bf4edce710e1fc960984/582a7ab9fa1f0aa9de70eb9d36bc47a52db720b0/README.yaml b/Simulations/80e/71c/80e71c6616d7eb421861bf4edce710e1fc960984/582a7ab9fa1f0aa9de70eb9d36bc47a52db720b0/README.yaml
index 72c026943..bb3f7112c 100644
--- a/Simulations/80e/71c/80e71c6616d7eb421861bf4edce710e1fc960984/582a7ab9fa1f0aa9de70eb9d36bc47a52db720b0/README.yaml
+++ b/Simulations/80e/71c/80e71c6616d7eb421861bf4edce710e1fc960984/582a7ab9fa1f0aa9de70eb9d36bc47a52db720b0/README.yaml
@@ -9,26 +9,22 @@ TIMELEFTOUT: 0
 COMPOSITION:
   POPG:
     NAME: PGR
-    MOLTYPE: system1
     MAPPING: mappingPOPGlipid17.yaml
     COUNT:
     - 187
     - 187
   POPE:
     NAME: PE
-    MOLTYPE: system2
     MAPPING: mappingPOPE_AmberLipid.yaml
     COUNT:
     - 63
     - 63
   SOD:
     NAME: Na+
-    MOLTYPE: Na+
     MAPPING: mappingNA+.yaml
     COUNT: 374
   SOL:
     NAME: WAT
-    MOLTYPE: WAT
     MAPPING: mappingTIP3Plipid17.yaml
     COUNT: 25000
 DIR_WRK: /usr/home/bort/Databank
diff --git a/Simulations/9da/554/9da554e9ba7fc98d12d7bebfcc0e9defe3617bd7/9da554e9ba7fc98d12d7bebfcc0e9defe3617bd7/README.yaml b/Simulations/9da/554/9da554e9ba7fc98d12d7bebfcc0e9defe3617bd7/9da554e9ba7fc98d12d7bebfcc0e9defe3617bd7/README.yaml
index dd1f742cb..39a1978dd 100644
--- a/Simulations/9da/554/9da554e9ba7fc98d12d7bebfcc0e9defe3617bd7/9da554e9ba7fc98d12d7bebfcc0e9defe3617bd7/README.yaml
+++ b/Simulations/9da/554/9da554e9ba7fc98d12d7bebfcc0e9defe3617bd7/9da554e9ba7fc98d12d7bebfcc0e9defe3617bd7/README.yaml
@@ -4,6 +4,8 @@ TRJ:
 - - traj_center_245ns.dcd
 PDB:
 - - struct.pdb
+PDB:
+- - struct.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
 TEMPERATURE: 298
@@ -18,7 +20,6 @@ COMPOSITION:
     NAME: TIP3
     MAPPING: mappingTIP3PCHARMMgui.yaml
     COUNT: 9000
-DIR_WRK: /home/sosamuli/temp/DataBank/
 PUBLICATION: Doktorova et al. 2017 Phys. Chem. Chem. Phys. article (DOI 10.1039/c7cp01921a)
 AUTHORS_CONTACT: Milka Doktorova
 SYSTEM: DLIPC simulation
diff --git a/Simulations/bf8/3a4/bf83a4c610244ec998461b093c395309dc91837e/bf83a4c610244ec998461b093c395309dc91837e/README.yaml b/Simulations/bf8/3a4/bf83a4c610244ec998461b093c395309dc91837e/bf83a4c610244ec998461b093c395309dc91837e/README.yaml
index fa1425b41..bc57dbc1d 100644
--- a/Simulations/bf8/3a4/bf83a4c610244ec998461b093c395309dc91837e/bf83a4c610244ec998461b093c395309dc91837e/README.yaml
+++ b/Simulations/bf8/3a4/bf83a4c610244ec998461b093c395309dc91837e/bf83a4c610244ec998461b093c395309dc91837e/README.yaml
@@ -4,6 +4,8 @@ TRJ:
 - - PM-like.dcd
 PDB:
 - - PM-like.pdb
+PSF:
+- - PM-like.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
 TEMPERATURE: 310
diff --git a/Simulations/cd7/7ee/cd77eec9b016a1d67b9b618a01aad1e9b6fd0ff8/d9694447765a4eee0db2e36364db29c6aa8d3230/README.yaml b/Simulations/cd7/7ee/cd77eec9b016a1d67b9b618a01aad1e9b6fd0ff8/d9694447765a4eee0db2e36364db29c6aa8d3230/README.yaml
index 9200bafdc..dd6b5304b 100644
--- a/Simulations/cd7/7ee/cd77eec9b016a1d67b9b618a01aad1e9b6fd0ff8/d9694447765a4eee0db2e36364db29c6aa8d3230/README.yaml
+++ b/Simulations/cd7/7ee/cd77eec9b016a1d67b9b618a01aad1e9b6fd0ff8/d9694447765a4eee0db2e36364db29c6aa8d3230/README.yaml
@@ -9,14 +9,12 @@ TIMELEFTOUT: 0
 COMPOSITION:
   POPG:
     NAME: PGR
-    MOLTYPE: system1
     MAPPING: mappingPOPGlipid17.yaml
     COUNT:
     - 187
     - 187
   POPE:
     NAME: PE
-    MOLTYPE: system2
     MAPPING: mappingPOPE_AmberLipid.yaml
     COUNT:
     - 63
diff --git a/Simulations/cf4/20a/cf420a356ed12c3697465d9933876dfbef382e98/cf420a356ed12c3697465d9933876dfbef382e98/README.yaml b/Simulations/cf4/20a/cf420a356ed12c3697465d9933876dfbef382e98/cf420a356ed12c3697465d9933876dfbef382e98/README.yaml
index a9443b5f8..d3244ddb6 100644
--- a/Simulations/cf4/20a/cf420a356ed12c3697465d9933876dfbef382e98/cf420a356ed12c3697465d9933876dfbef382e98/README.yaml
+++ b/Simulations/cf4/20a/cf420a356ed12c3697465d9933876dfbef382e98/cf420a356ed12c3697465d9933876dfbef382e98/README.yaml
@@ -14,12 +14,11 @@ COMPOSITION:
     COUNT:
     - 34
     - 38
-DIR_WRK: /home/lara/Databank
 PUBLICATION: null
 AUTHORS_CONTACT: Kav, Batuhan
-SYSTEM: 72POPC_303K
+SYSTEM: 72POPC_303K (equilibriated using Charmm36)
 SOFTWARE_VERSION: 7.4.1
-FF: Charmm-Drude polarizable; system has been equilibriated using Charmm36
+FF: Charmm-Drude polarizable
 FF_SOURCE: null
 FF_DATE: null
 CHK: null
@@ -34,6 +33,6 @@ WARNINGS:
   NOWATER: true
 EXPERIMENT:
   ORDERPARAMETER:
-    POPC: {}
-  FORMFACTOR: {}
+    POPC: []
+  FORMFACTOR: []
 ID: 562
diff --git a/Simulations/cfc/4c4/cfc4c4be95331177929f47a2f1c59f2792643901/112cf0742e84e4dbdd3598c8bcc6921f84378fb3/README.yaml b/Simulations/cfc/4c4/cfc4c4be95331177929f47a2f1c59f2792643901/112cf0742e84e4dbdd3598c8bcc6921f84378fb3/README.yaml
index 2c57c7fab..ae0c78ec4 100644
--- a/Simulations/cfc/4c4/cfc4c4be95331177929f47a2f1c59f2792643901/112cf0742e84e4dbdd3598c8bcc6921f84378fb3/README.yaml
+++ b/Simulations/cfc/4c4/cfc4c4be95331177929f47a2f1c59f2792643901/112cf0742e84e4dbdd3598c8bcc6921f84378fb3/README.yaml
@@ -14,14 +14,12 @@ DIR_WRK: /media/akiirikk/DATADRIVE1/tietokanta/Data/tmp/DATABANK/tmp_6-935999/
 COMPOSITION:
   POPC:
     NAME: PC
-    MOLTYPE: system1
     MAPPING: mappingPOPC_AmberLipid.yaml
     COUNT:
     - 175
     - 175
   POPG:
     NAME: PGR
-    MOLTYPE: system2
     MAPPING: mappingPOPGlipid17ecc.yaml
     COUNT:
     - 44
diff --git a/Simulations/d83/418/d8341882481f7f4762372c4977c06b4a1ce3634b/1ea3606eb89db05b49b6e869701993ae39c9d381/README.yaml b/Simulations/d83/418/d8341882481f7f4762372c4977c06b4a1ce3634b/1ea3606eb89db05b49b6e869701993ae39c9d381/README.yaml
index 417f75b21..197054d55 100644
--- a/Simulations/d83/418/d8341882481f7f4762372c4977c06b4a1ce3634b/1ea3606eb89db05b49b6e869701993ae39c9d381/README.yaml
+++ b/Simulations/d83/418/d8341882481f7f4762372c4977c06b4a1ce3634b/1ea3606eb89db05b49b6e869701993ae39c9d381/README.yaml
@@ -9,14 +9,12 @@ TIMELEFTOUT: 0
 COMPOSITION:
   POPC:
     NAME: PC
-    MOLTYPE: system1
     MAPPING: mappingPOPC_AmberLipid.yaml
     COUNT:
     - 75
     - 75
   POPG:
     NAME: PGR
-    MOLTYPE: system2
     MAPPING: mappingPOPGlipid17.yaml
     COUNT:
     - 77
diff --git a/Simulations/e61/525/e61525dce3f7538ed14d8371ae22cad3e41c3d89/e61525dce3f7538ed14d8371ae22cad3e41c3d89/README.yaml b/Simulations/e61/525/e61525dce3f7538ed14d8371ae22cad3e41c3d89/e61525dce3f7538ed14d8371ae22cad3e41c3d89/README.yaml
index dc99959d7..ba90d6308 100644
--- a/Simulations/e61/525/e61525dce3f7538ed14d8371ae22cad3e41c3d89/e61525dce3f7538ed14d8371ae22cad3e41c3d89/README.yaml
+++ b/Simulations/e61/525/e61525dce3f7538ed14d8371ae22cad3e41c3d89/e61525dce3f7538ed14d8371ae22cad3e41c3d89/README.yaml
@@ -2,8 +2,10 @@ DOI: 10.5281/zenodo.8000133
 SOFTWARE: openMM
 TRJ:
 - - traj.xtc
-PDB:
+PSF:
 - - step2_drude.psf
+PDB:
+- - step2_drude.pdb
 PREEQTIME: 200
 TIMELEFTOUT: 0
 TEMPERATURE: 303
@@ -26,14 +28,13 @@ COMPOSITION:
     NAME: CLA
     MAPPING: mappingCLAcharmmPolarizable.yaml
     COUNT: 115
-DIR_WRK: /home/peptid/drude
 PUBLICATION: null
 AUTHORS_CONTACT: Kav, Batuhan
 SYSTEM: POPC_1000_NaCl_CHARMMdrude2023_303K
 SOFTWARE_VERSION: null
-FF: Charmm-Drude polarizable2023
+FF: Charmm-Drude polarizable
 FF_SOURCE: https://doi.org/10.1021/acs.jctc.3c00203
-FF_DATE: null
+FF_DATE: 2023
 CHK: null
 TOP: null
 CRD: null
diff --git a/Simulations/e6c/834/e6c834e53bc624e7861a7b60dd5c68767af53cc1/ba5f536a0370e05367045f5a329a37244cb6ecc1/README.yaml b/Simulations/e6c/834/e6c834e53bc624e7861a7b60dd5c68767af53cc1/ba5f536a0370e05367045f5a329a37244cb6ecc1/README.yaml
index 088976654..48d23dde0 100644
--- a/Simulations/e6c/834/e6c834e53bc624e7861a7b60dd5c68767af53cc1/ba5f536a0370e05367045f5a329a37244cb6ecc1/README.yaml
+++ b/Simulations/e6c/834/e6c834e53bc624e7861a7b60dd5c68767af53cc1/ba5f536a0370e05367045f5a329a37244cb6ecc1/README.yaml
@@ -9,14 +9,12 @@ TIMELEFTOUT: 0
 COMPOSITION:
   POPC:
     NAME: PC
-    MOLTYPE: system1
     MAPPING: mappingPOPC_AmberLipid.yaml
     COUNT:
     - 175
     - 175
   POPG:
     NAME: PGR
-    MOLTYPE: system2
     MAPPING: mappingPOPGlipid17.yaml
     COUNT:
     - 44
diff --git a/Simulations/e97/2fb/e972fb7afc0ab78c7004c0971d5055b2a0cdc51f/e972fb7afc0ab78c7004c0971d5055b2a0cdc51f/README.yaml b/Simulations/e97/2fb/e972fb7afc0ab78c7004c0971d5055b2a0cdc51f/e972fb7afc0ab78c7004c0971d5055b2a0cdc51f/README.yaml
index dfb3658fe..da15d4b50 100644
--- a/Simulations/e97/2fb/e972fb7afc0ab78c7004c0971d5055b2a0cdc51f/e972fb7afc0ab78c7004c0971d5055b2a0cdc51f/README.yaml
+++ b/Simulations/e97/2fb/e972fb7afc0ab78c7004c0971d5055b2a0cdc51f/e972fb7afc0ab78c7004c0971d5055b2a0cdc51f/README.yaml
@@ -18,7 +18,6 @@ COMPOSITION:
     NAME: SWM
     MAPPING: mappingSWM4water.yaml
     COUNT: 6400
-DIR_WRK: /media/osollila/Data1/tmp/DATABANK/
 PUBLICATION: null
 AUTHORS_CONTACT: Kav, Batuhan
 SYSTEM: 64POPC_6400SOL_303K
diff --git a/Simulations/ef4/520/ef45203f9f3dec57f2dcffb6fee9b51fe9447f08/ef45203f9f3dec57f2dcffb6fee9b51fe9447f08/README.yaml b/Simulations/ef4/520/ef45203f9f3dec57f2dcffb6fee9b51fe9447f08/ef45203f9f3dec57f2dcffb6fee9b51fe9447f08/README.yaml
index a3e1c6aa8..6308e3f49 100644
--- a/Simulations/ef4/520/ef45203f9f3dec57f2dcffb6fee9b51fe9447f08/ef45203f9f3dec57f2dcffb6fee9b51fe9447f08/README.yaml
+++ b/Simulations/ef4/520/ef45203f9f3dec57f2dcffb6fee9b51fe9447f08/ef45203f9f3dec57f2dcffb6fee9b51fe9447f08/README.yaml
@@ -2,7 +2,7 @@ DOI: 10.5281/zenodo.7916494
 SOFTWARE: openMM
 TRJ:
 - - pope3ns.xtc
-PDB:
+PSF:
 - - pope72_drude.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
@@ -18,14 +18,13 @@ COMPOSITION:
     NAME: SWM4
     MAPPING: mappingSWM4water.yaml
     COUNT: 2304
-DIR_WRK: /home/sosamuli/temp/DataBank/
 PUBLICATION: null
 AUTHORS_CONTACT: Kav, Batuhan
 SYSTEM: POPE_CHARMMdrude2023_308K
 SOFTWARE_VERSION: null
-FF: Charmm-Drude polarizable2023
+FF: Charmm-Drude polarizable
 FF_SOURCE: null
-FF_DATE: null
+FF_DATE: 2023
 CHK: null
 TOP: null
 CRD: null
diff --git a/Simulations/fb8/2e4/fb82e4f256fd9c13a9a29a32fbd1f9a8d2191ef6/fb82e4f256fd9c13a9a29a32fbd1f9a8d2191ef6/README.yaml b/Simulations/fb8/2e4/fb82e4f256fd9c13a9a29a32fbd1f9a8d2191ef6/fb82e4f256fd9c13a9a29a32fbd1f9a8d2191ef6/README.yaml
index a573fb333..e89afb093 100644
--- a/Simulations/fb8/2e4/fb82e4f256fd9c13a9a29a32fbd1f9a8d2191ef6/fb82e4f256fd9c13a9a29a32fbd1f9a8d2191ef6/README.yaml
+++ b/Simulations/fb8/2e4/fb82e4f256fd9c13a9a29a32fbd1f9a8d2191ef6/fb82e4f256fd9c13a9a29a32fbd1f9a8d2191ef6/README.yaml
@@ -2,7 +2,7 @@ DOI: 10.5281/zenodo.7916287
 SOFTWARE: openMM
 TRJ:
 - - popc2ns.xtc
-PDB:
+PSF:
 - - popc72_drude.psf
 PREEQTIME: 0
 TIMELEFTOUT: 0
@@ -18,14 +18,13 @@ COMPOSITION:
     NAME: SWM4
     MAPPING: mappingSWM4water.yaml
     COUNT: 2239
-DIR_WRK: /home/sosamuli/temp/DataBank/
 PUBLICATION: null
 AUTHORS_CONTACT: Kav, Batuhan
 SYSTEM: POPC_CHARMMdrude2023_303K
 SOFTWARE_VERSION: null
-FF: Charmm-Drude polarizable2023
+FF: Charmm-Drude polarizable
 FF_SOURCE: null
-FF_DATE: null
+FF_DATE: 2023
 CHK: null
 TOP: null
 CRD: null
diff --git a/experiments/OrderParameters/10.1021/bi3009399/README.yaml b/experiments/OrderParameters/10.1021/bi3009399/1/README.yaml
similarity index 68%
rename from experiments/OrderParameters/10.1021/bi3009399/README.yaml
rename to experiments/OrderParameters/10.1021/bi3009399/1/README.yaml
index f307a0784..2aa8159e4 100644
--- a/experiments/OrderParameters/10.1021/bi3009399/README.yaml
+++ b/experiments/OrderParameters/10.1021/bi3009399/1/README.yaml
@@ -1,12 +1,13 @@
 DOI: 10.1021/bi3009399
 TEMPERATURE: 303.2
 MOLAR_FRACTIONS:
-  SSM: 0.5
+  SM18: 0.5
   CHOL: 0.5
 ION_CONCENTRATIONS:
   POT: 0
   SOD: 0
   CLA: 0
   CAL: 0
-TOTAL_LIPID_CONCENTRATION: 50 wt%
+TOTAL_LIPID_CONCENTRATION: 'full hydration'
+# 50 wt%
 COUNTER_IONS:
diff --git a/experiments/OrderParameters/10.1021/bi3009399/SSM_Order_Parameters.dat b/experiments/OrderParameters/10.1021/bi3009399/1/SSM_Order_Parameters.dat
similarity index 100%
rename from experiments/OrderParameters/10.1021/bi3009399/SSM_Order_Parameters.dat
rename to experiments/OrderParameters/10.1021/bi3009399/1/SSM_Order_Parameters.dat