diff --git a/core/src/main/java/de/srsoftware/umbrella/core/BaseHandler.java b/core/src/main/java/de/srsoftware/umbrella/core/BaseHandler.java
index e9c773b..03af3d2 100644
--- a/core/src/main/java/de/srsoftware/umbrella/core/BaseHandler.java
+++ b/core/src/main/java/de/srsoftware/umbrella/core/BaseHandler.java
@@ -34,6 +34,11 @@ public abstract class BaseHandler extends PathHandler {
 		return ex;
 	}
 
+	@Override
+	public boolean doOptions(Path path, HttpExchange ex) throws IOException {
+		return ok(addCors(ex));
+	}
+
 	public boolean load(Path path, HttpExchange ex) throws IOException {
 		try {
 			var doc = load(path.toString());
diff --git a/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java b/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java
index 3fb795e..507dc42 100644
--- a/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java
+++ b/documents/src/main/java/de/srsoftware/umbrella/documents/DocumentApi.java
@@ -160,13 +160,6 @@ public class DocumentApi extends BaseHandler {
 		}
 	}
 
-
-
-	@Override
-	public boolean doOptions(Path path, HttpExchange ex) throws IOException {
-		return sendEmptyResponse(HTTP_OK,addCors(ex));
-	}
-
 	@Override
 	public boolean doPatch(Path path, HttpExchange ex) throws IOException {
 		addCors(ex);
diff --git a/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java b/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java
index 46645ee..7707d06 100644
--- a/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java
+++ b/notes/src/main/java/de/srsoftware/umbrella/notes/NoteModule.java
@@ -92,12 +92,6 @@ public class NoteModule extends BaseHandler implements NoteService {
 		}
 	}
 
-	@Override
-	public boolean doOptions(Path path, HttpExchange ex) throws IOException {
-		addCors(ex);
-		return sendEmptyResponse(HTTP_OK,ex);
-	}
-
 	@Override
 	public boolean doPatch(Path path, HttpExchange ex) throws IOException {
 		addCors(ex);
diff --git a/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java b/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java
index 5895e9d..649f2a8 100644
--- a/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java
+++ b/project/src/main/java/de/srsoftware/umbrella/project/ProjectModule.java
@@ -82,12 +82,6 @@ public class ProjectModule extends BaseHandler implements ProjectService {
 		}
 	}
 
-	@Override
-	public boolean doOptions(Path path, HttpExchange ex) throws IOException {
-		addCors(ex);
-		return sendEmptyResponse(HTTP_OK,ex);
-	}
-
 	@Override
 	public boolean doPatch(Path path, HttpExchange ex) throws IOException {
 		addCors(ex);
diff --git a/tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java b/tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java
index 19fabfd..cb92714 100644
--- a/tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java
+++ b/tags/src/main/java/de/srsoftware/umbrella/tags/TagModule.java
@@ -84,12 +84,6 @@ public class TagModule extends BaseHandler implements TagService {
 		return sendContent(ex,tagDb.getUses(tag,user.id()));
 	}
 
-	@Override
-	public boolean doOptions(Path path, HttpExchange ex) throws IOException {
-		addCors(ex);
-		return sendEmptyResponse(HTTP_OK,ex);
-	}
-
 	@Override
 	public boolean doPost(Path path, HttpExchange ex) throws IOException {
 		addCors(ex);
diff --git a/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java b/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java
index 908b06c..e4f99cd 100644
--- a/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java
+++ b/task/src/main/java/de/srsoftware/umbrella/task/TaskModule.java
@@ -115,12 +115,6 @@ public class TaskModule extends BaseHandler implements TaskService {
 		}
 	}
 
-	@Override
-	public boolean doOptions(Path path, HttpExchange ex) throws IOException {
-		addCors(ex);
-		return sendEmptyResponse(HTTP_OK,ex);
-	}
-
 	@Override
 	public boolean doPatch(Path path, HttpExchange ex) throws IOException {
 		addCors(ex);
diff --git a/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java b/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java
index 53f5809..71e3694 100644
--- a/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java
+++ b/user/src/main/java/de/srsoftware/umbrella/user/UserModule.java
@@ -200,11 +200,6 @@ public class UserModule extends BaseHandler implements UserService {
 
 	}
 
-	@Override
-	public boolean doOptions(Path path, HttpExchange ex) throws IOException {
-		return ok(addCors(ex));
-	}
-
 	public boolean doPatch(Path path, HttpExchange ex) throws IOException {
 		addCors(ex);
 		String head = null;