diff --git a/.zenodo.json b/.zenodo.json
index c088975486..4947652468 100644
--- a/.zenodo.json
+++ b/.zenodo.json
@@ -94,6 +94,11 @@
             "type": "Other",
             "name": "Krzewicki, Mikolaj"
         },
+        {
+            "type": "Other",
+            "name": "Lalik, Rafa\u0142",
+            "orcid": "0000-0003-1313-3729"
+        },
         {
             "type": "Other",
             "name": "Lavezzi, Lia"
diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md
index d97e77cc51..d3cf390829 100644
--- a/CONTRIBUTING.md
+++ b/CONTRIBUTING.md
@@ -13,7 +13,10 @@ Create a [Github Pull Request](https://github.com/FairRootGroup/FairRoot/compare
    * In rare cases (e.g. backports, some hotfixes) base against the appropriate
      branch.
 2. If you are a first time contributor, add a separate commit in your PR which
-   adds your name to the [`CONTRIBUTORS`](CONTRIBUTORS) file.
+   adds your name to the:
+   * [`CONTRIBUTORS`](CONTRIBUTORS) file,
+   * [`.zenodo.json`](.zenodo.json) file, and
+   * [`codemeta.json`](codemeta.json) file.
 3. Follow our [Coding Guidelines](#coding-guidelines).
 4. Expect that a reviewer will ask you for restructuring your commits! This
    usually happens towards the end of the lifetime of a PR when it matured
@@ -53,7 +56,15 @@ This shall be an evolving list of explicitely adopted C++ Core Guidelines:
    * If an owning raw pointer cannot be avoided for legacy reasons,
      **you must add a comment documenting the ownership semantics!**
 
-### G.3 Write a good Git history
+### G.3 Other C++ Guidelines
+
+1. Use of ROOT types:
+   1. The data which are intended to be stored in the ROOT files should use ROOT data type.
+   2. Variables which control execution logic should use standard types.
+
+## V - Version control
+
+### V.1 Write a good Git history
 
 * Follow [the seven rules of a great Git commit message](https://cbea.ms/git-commit/#seven-rules)!
 * Use a meaningful commit granularity, e.g. do not mix
@@ -65,7 +76,7 @@ This shall be an evolving list of explicitely adopted C++ Core Guidelines:
 * Utilize [reference keywords](https://docs.github.com/en/issues/tracking-your-work-with-issues/linking-a-pull-request-to-an-issue#linking-a-pull-request-to-an-issue-using-a-keyword)
   both in commit messages as well as in PR comments if applicable.
 
-### G.4 Conventional Commits
+### V.2 Conventional Commits
 
 * Follow the [Conventional Commits Specification](https://www.conventionalcommits.org/en/v1.0.0/)
 * Adopted `type`s: `fix:`, `feat:`, `build:`, `chore:`, `ci:`, `docs:`,
@@ -73,7 +84,7 @@ This shall be an evolving list of explicitely adopted C++ Core Guidelines:
 * If a `scope` is used, prefer the library name (first directory level below
   `fairroot/`), e.g. `fix(base):` or `feat(geobase):`
 
-### G.5 Signed Commits and Tags
+### V.3 Signed Commits and Tags
 
 You may use any signature format Git and Github support (SSH e.g. may be more
 convenient, if one does not have a GPG key yet).
diff --git a/CONTRIBUTORS b/CONTRIBUTORS
index c42840f9cd..2ea92c5ab2 100644
--- a/CONTRIBUTORS
+++ b/CONTRIBUTORS
@@ -14,6 +14,7 @@ Klenze, Philipp
 Kollegger, Thorsten
 Koenig, Ilse
 Krzewicki, Mikolaj
+Lalik, Rafał [https://orcid.org/0000-0003-1313-3729]
 Lavezzi, Lia
 Lavrik, Evgeny
 Lantwin, Oliver
diff --git a/codemeta.json b/codemeta.json
index bce898658d..e1b733b763 100644
--- a/codemeta.json
+++ b/codemeta.json
@@ -150,6 +150,12 @@
       "givenName": "Mikolaj",
       "familyName": "Krzewicki"
     },
+    {
+      "@type": "Person",
+      "@id": "https://orcid.org/0000-0003-1313-3729",
+      "givenName": "Rafa\u0142",
+      "familyName": "Lalik"
+    },
     {
       "@type": "Person",
       "givenName": "Lia",