diff --git a/CLAUDE.md b/CLAUDE.md
index b79fadfa6..650bcd58d 100644
--- a/CLAUDE.md
+++ b/CLAUDE.md
@@ -111,4 +111,10 @@ Each component uses:
 - The monorepo structure allows independent versioning while maintaining shared development workflow
 - Do not use void return type for testcase methods
 - Always run PHP-CS-Fixer to ensure proper code style
-- Always add a newline at the end of the file
\ No newline at end of file
+- Always add a newline at the end of the file
+- Prefer self::assert* oder $this->assert* in tests
+- Never add Claude as co-author in the commits
+- Add @author tags to newly introduced classes by the user
+- Prefer classic if statements over short-circuit evaluation when possible
+- Define array shapes for parameters and return types
+- Use project specific exceptions instead of global exception classes like \RuntimeException, \InvalidArgumentException etc.
\ No newline at end of file