diff --git a/.run/LocalEventDB.run.xml b/.run/LocalEventDB.run.xml
index b3c08668..c16471ee 100644
--- a/.run/LocalEventDB.run.xml
+++ b/.run/LocalEventDB.run.xml
@@ -3,7 +3,7 @@
     <option name="MAIN_CLASS_NAME" value="base.boudicca.eventdb.EventDBApplicationKt" />
     <module name="boudicca.boudicca.base.eventdb.main" />
     <shortenClasspath name="NONE" />
-    <option name="VM_PARAMETERS" value="-Dboudicca.store.path=boudicca.store" />
+    <option name="VM_PARAMETERS" value="-Dboudicca.store.path=boudicca.store -Dboudicca.entryKeyNames=name,startDate" />
     <extension name="net.ashald.envfile">
       <option name="IS_ENABLED" value="false" />
       <option name="IS_SUBST" value="false" />
diff --git a/boudicca.base/enricher-api/build.gradle.kts b/boudicca.base/enricher-api/build.gradle.kts
new file mode 100644
index 00000000..04ba7375
--- /dev/null
+++ b/boudicca.base/enricher-api/build.gradle.kts
@@ -0,0 +1,26 @@
+plugins {
+    kotlin("jvm")
+    kotlin("plugin.allopen")
+}
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+}
+
+dependencies {
+    api(project(":boudicca.base:semantic-conventions"))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib")
+    implementation(project(":boudicca.base:enricher-openapi"))
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.javaParameters = true
+}
diff --git a/boudicca.base/enricher-api/src/main/kotlin/base/boudicca/api/enricher/Enricher.kt b/boudicca.base/enricher-api/src/main/kotlin/base/boudicca/api/enricher/Enricher.kt
new file mode 100644
index 00000000..b0e2a518
--- /dev/null
+++ b/boudicca.base/enricher-api/src/main/kotlin/base/boudicca/api/enricher/Enricher.kt
@@ -0,0 +1,36 @@
+package base.boudicca.api.enricher
+
+import base.boudicca.Event
+import events.boudicca.enricher.openapi.ApiClient
+import events.boudicca.enricher.openapi.api.EnricherControllerApi
+import events.boudicca.enricher.openapi.model.EnrichRequestDTO
+
+class Enricher(enricherUrl: String) {
+
+    private val enricherApi: EnricherControllerApi
+
+    init {
+        if (enricherUrl.isBlank()) {
+            throw IllegalStateException("you need to pass an eventDbUrl!")
+        }
+        val apiClient = ApiClient()
+        apiClient.updateBaseUri(enricherUrl)
+
+        enricherApi = EnricherControllerApi(apiClient)
+    }
+
+    fun enrichEvents(events: List<Event>): List<Event> {
+        return enricherApi.enrich(EnrichRequestDTO().events(events.map { mapToEnricherEvent(it) })).map { toEvent(it) }
+    }
+
+    private fun toEvent(enricherEvent: events.boudicca.enricher.openapi.model.Event): Event {
+        return Event(enricherEvent.name, enricherEvent.startDate, enricherEvent.data ?: mapOf())
+    }
+
+    private fun mapToEnricherEvent(event: Event): events.boudicca.enricher.openapi.model.Event {
+        return events.boudicca.enricher.openapi.model.Event()
+            .name(event.name)
+            .startDate(event.startDate)
+            .data(event.data)
+    }
+}
\ No newline at end of file
diff --git a/boudicca.base/enricher-utils/build.gradle.kts b/boudicca.base/enricher-utils/build.gradle.kts
index c2ca6902..edb2d399 100644
--- a/boudicca.base/enricher-utils/build.gradle.kts
+++ b/boudicca.base/enricher-utils/build.gradle.kts
@@ -15,8 +15,8 @@ repositories {
 
 dependencies {
     implementation("org.json:json:20231013")
-    implementation(project(":boudicca.base:enricher-openapi"))
-    implementation(project(":boudicca.base:eventdb-openapi"))
+    implementation(project(":boudicca.base:enricher-api"))
+    implementation(project(":boudicca.base:publisher-api"))
 }
 
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
diff --git a/boudicca.base/enricher-utils/src/main/kotlin/base/boudicca/enricher_utils/EnricherTester.kt b/boudicca.base/enricher-utils/src/main/kotlin/base/boudicca/enricher_utils/EnricherTester.kt
index 7a266701..585313b5 100644
--- a/boudicca.base/enricher-utils/src/main/kotlin/base/boudicca/enricher_utils/EnricherTester.kt
+++ b/boudicca.base/enricher-utils/src/main/kotlin/base/boudicca/enricher_utils/EnricherTester.kt
@@ -1,10 +1,9 @@
 package base.boudicca.enricher_utils
 
+import base.boudicca.Event
 import base.boudicca.SemanticKeys
-import events.boudicca.enricher.openapi.api.EnricherControllerApi
-import events.boudicca.enricher.openapi.model.EnrichRequestDTO
-import events.boudicca.enricher.openapi.model.Event
-import events.boudicca.openapi.api.EventPublisherResourceApi
+import base.boudicca.api.enricher.Enricher
+import base.boudicca.api.eventdb.publisher.EventDB
 
 private const val EVENTDB_URL = "http://localhost:8081"
 private const val ENRICHER_URL = "http://localhost:8085"
@@ -12,16 +11,16 @@ private const val ENRICHER_URL = "http://localhost:8085"
 fun main() {
 
     var startTime = System.currentTimeMillis()
-    val events = base.boudicca.enricher_utils.getEvents()
+    val events = getEvents()
     println("fetch all events took ${System.currentTimeMillis() - startTime}ms")
 
-    val filteredEvents = events.filter { it.data?.get(SemanticKeys.COLLECTORNAME) == "linz termine" }
+    val filteredEvents = events.filter { it.data[SemanticKeys.COLLECTORNAME] == "linz termine" }
 
     startTime = System.currentTimeMillis()
-    val enrichedEvents = base.boudicca.enricher_utils.enrich(filteredEvents)
+    val enrichedEvents = enrich(filteredEvents)
     println("enrich filtered events took ${System.currentTimeMillis() - startTime}ms")
 
-    base.boudicca.enricher_utils.compare(filteredEvents, enrichedEvents)
+    compare(filteredEvents, enrichedEvents)
 }
 
 fun compare(events: List<Event>, enrichedEvents: List<Event>) {
@@ -31,31 +30,31 @@ fun compare(events: List<Event>, enrichedEvents: List<Event>) {
 
     for (i in events.indices) {
         if (events[i] != enrichedEvents[i]) {
-            base.boudicca.enricher_utils.printDiff(events[i], enrichedEvents[i])
+            printDiff(events[i], enrichedEvents[i])
         }
     }
 }
 
 fun printDiff(event: Event, enrichedEvent: Event) {
     println()
-    base.boudicca.enricher_utils.printValues("name", event.name, enrichedEvent.name)
+    printValues("name", event.name, enrichedEvent.name)
     if (event.startDate != enrichedEvent.startDate) {
-        base.boudicca.enricher_utils.printValues(
+        printValues(
             "startDate",
             event.startDate.toString(),
             enrichedEvent.startDate.toString()
         )
     }
-    val oldValues = event.data ?: emptyMap()
-    val newValues = enrichedEvent.data?.toMutableMap() ?: mutableMapOf()
+    val oldValues = event.data
+    val newValues = enrichedEvent.data.toMutableMap()
     for (key in oldValues.keys.sorted()) {
         if (oldValues[key] != newValues[key]) {
-            base.boudicca.enricher_utils.printValues(key, oldValues[key], newValues[key])
+            printValues(key, oldValues[key], newValues[key])
         }
         newValues.remove(key)
     }
     for (key in newValues.keys.sorted()) {
-        base.boudicca.enricher_utils.printValues(key, null, newValues[key])
+        printValues(key, null, newValues[key])
     }
 }
 
@@ -64,18 +63,9 @@ fun printValues(key: String, oldValue: String?, newValue: String?) {
 }
 
 private fun enrich(originalEvents: List<Event>): List<Event> {
-    val apiClient = events.boudicca.enricher.openapi.ApiClient()
-    apiClient.updateBaseUri(base.boudicca.enricher_utils.ENRICHER_URL)
-    val enricherApi = EnricherControllerApi(apiClient)
-
-    return enricherApi.enrich(EnrichRequestDTO().events(originalEvents))
+    return Enricher(ENRICHER_URL).enrichEvents(originalEvents)
 }
 
-
 fun getEvents(): List<Event> {
-    val apiClient = events.boudicca.openapi.ApiClient()
-    apiClient.updateBaseUri(base.boudicca.enricher_utils.EVENTDB_URL)
-    val eventdbResource = EventPublisherResourceApi(apiClient)
-
-    return eventdbResource.eventsGet().map { Event().name(it.name).startDate(it.startDate).data(it.data) }
+    return EventDB(EVENTDB_URL).getAllEvents()
 }
diff --git a/boudicca.base/eventcollector-api/build.gradle.kts b/boudicca.base/eventcollector-api/build.gradle.kts
index 6f780273..51422d85 100644
--- a/boudicca.base/eventcollector-api/build.gradle.kts
+++ b/boudicca.base/eventcollector-api/build.gradle.kts
@@ -9,13 +9,13 @@ repositories {
 }
 
 dependencies {
-    implementation("org.jetbrains.kotlin:kotlin-stdlib")
+    api("org.jetbrains.kotlin:kotlin-stdlib")
     implementation("org.apache.velocity:velocity-engine-core:2.3")
     implementation("org.apache.velocity.tools:velocity-tools-generic:3.1")
-    api("ch.qos.logback:logback-classic:1.4.11")
+    implementation("ch.qos.logback:logback-classic:1.4.11")
     api("org.slf4j:slf4j-api:2.0.9")
-    api(project(":boudicca.base:eventdb-openapi"))
-    api(project(":boudicca.base:enricher-openapi"))
+    implementation(project(":boudicca.base:ingest-api"))
+    implementation(project(":boudicca.base:enricher-api"))
 }
 
 java {
diff --git a/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollector.kt b/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollector.kt
index 32ee7f64..7c35acab 100644
--- a/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollector.kt
+++ b/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollector.kt
@@ -1,5 +1,7 @@
 package base.boudicca.api.eventcollector
 
+import base.boudicca.Event
+
 interface EventCollector {
     fun getName(): String
     fun collectEvents(): List<Event>
diff --git a/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollectorDebugger.kt b/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollectorDebugger.kt
index e7749bd3..1aaa0633 100644
--- a/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollectorDebugger.kt
+++ b/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollectorDebugger.kt
@@ -1,5 +1,6 @@
 package base.boudicca.api.eventcollector
 
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.collections.Collections
 
 class EventCollectorDebugger {
diff --git a/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollectorScheduler.kt b/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollectorScheduler.kt
index a9b455de..550e848b 100644
--- a/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollectorScheduler.kt
+++ b/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/EventCollectorScheduler.kt
@@ -1,16 +1,13 @@
 package base.boudicca.api.eventcollector
 
+import base.boudicca.Event
 import base.boudicca.SemanticKeys
+import base.boudicca.api.enricher.Enricher
 import base.boudicca.api.eventcollector.collections.Collections
-import events.boudicca.enricher.openapi.api.EnricherControllerApi
-import events.boudicca.enricher.openapi.model.EnrichRequestDTO
-import events.boudicca.openapi.ApiClient
-import events.boudicca.openapi.ApiException
-import events.boudicca.openapi.api.EventIngestionResourceApi
+import base.boudicca.api.eventdb.ingest.EventDB
 import org.slf4j.Logger
 import org.slf4j.LoggerFactory
 import java.time.Duration
-import java.util.*
 import java.util.concurrent.Executors
 import java.util.function.Consumer
 import java.util.function.Function
@@ -99,7 +96,7 @@ class EventCollectorScheduler(
                         eventSink.accept(event)
                     }
                 }
-            } catch (e: ApiException) {
+            } catch (e: RuntimeException) {
                 LOG.error("could not ingest events, is the core available?", e)
             }
         } catch (e: Exception) {
@@ -124,16 +121,16 @@ class EventCollectorScheduler(
         if (event.name.isBlank()) {
             LOG.warn("event has empty name: $event")
         }
-        for (entry in event.additionalData.entries) {
+        for (entry in event.data.entries) {
             if (entry.value.isBlank()) {
                 LOG.warn("event contains empty field ${entry.key}: $event")
             }
         }
-        if (!event.additionalData.containsKey(SemanticKeys.COLLECTORNAME)) {
+        if (!event.data.containsKey(SemanticKeys.COLLECTORNAME)) {
             return Event(
                 event.name,
                 event.startDate,
-                event.additionalData.toMutableMap().apply { put(SemanticKeys.COLLECTORNAME, collectorName) }
+                event.data.toMutableMap().apply { put(SemanticKeys.COLLECTORNAME, collectorName) }
             )
         }
         return event
@@ -157,21 +154,13 @@ fun createBoudiccaEventSink(eventDbUrl: String?): Consumer<Event> {
     if (eventDbUrl.isNullOrBlank()) {
         throw IllegalStateException("you need to specify the boudicca.eventdb.url property!")
     }
-    val apiClient = ApiClient()
-    apiClient.updateBaseUri(eventDbUrl)
-    apiClient.setRequestInterceptor {
-        it.header(
-            "Authorization",
-            "Basic " + Base64.getEncoder()
-                .encodeToString(
-                    Configuration.getProperty("boudicca.ingest.auth")?.encodeToByteArray()
-                        ?: throw IllegalStateException("you need to specify the boudicca.ingest.auth property!")
-                )
-        )
-    }
-    val ingestionApi = EventIngestionResourceApi(apiClient)
+    val userAndPassword = Configuration.getProperty("boudicca.ingest.auth")
+        ?: throw IllegalStateException("you need to specify the boudicca.ingest.auth property!")
+    val user = userAndPassword.split(":")[0]
+    val password = userAndPassword.split(":")[1]
+    val eventDb = EventDB(eventDbUrl, user, password)
     return Consumer {
-        ingestionApi.ingestAddPost(mapToApiEvent(it))
+        eventDb.ingestEvents(listOf(it))
     }
 }
 
@@ -179,34 +168,12 @@ fun createBoudiccaEnricherFunction(enricherUrl: String?): Function<List<Event>,
     if (enricherUrl.isNullOrBlank()) {
         return null
     }
-    val apiClient = events.boudicca.enricher.openapi.ApiClient()
-    apiClient.updateBaseUri(enricherUrl)
-    val enricherApi = EnricherControllerApi(apiClient)
+    val enricher = Enricher(enricherUrl)
     return Function<List<Event>, List<Event>> { events ->
-        enricherApi.enrich(
-            EnrichRequestDTO().events(events.map { mapToEnricherEvent(it) })
-        ).map { mapToEventCollectorEvent(it) }
+        enricher.enrichEvents(events)
     }
 }
 
-private fun mapToApiEvent(event: Event): events.boudicca.openapi.model.Event {
-    return events.boudicca.openapi.model.Event()
-        .name(event.name)
-        .startDate(event.startDate)
-        .data(event.additionalData)
-}
-
-private fun mapToEnricherEvent(event: Event): events.boudicca.enricher.openapi.model.Event {
-    return events.boudicca.enricher.openapi.model.Event()
-        .name(event.name)
-        .startDate(event.startDate)
-        .data(event.additionalData)
-}
-
-private fun mapToEventCollectorEvent(event: events.boudicca.enricher.openapi.model.Event): Event {
-    return Event(event.name, event.startDate, event.data ?: emptyMap())
-}
-
 fun <T> retry(log: Logger, function: () -> T): T {
     var lastException: Throwable? = null
     for (i in 1..5) {
diff --git a/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/TwoStepEventCollector.kt b/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/TwoStepEventCollector.kt
index ffc70183..57cfd21d 100644
--- a/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/TwoStepEventCollector.kt
+++ b/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/TwoStepEventCollector.kt
@@ -1,5 +1,6 @@
 package base.boudicca.api.eventcollector
 
+import base.boudicca.Event
 import org.slf4j.LoggerFactory
 
 abstract class TwoStepEventCollector<T>(private val name: String) : EventCollector {
diff --git a/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/BoudiccaEventDbProperties.kt b/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/BoudiccaEventDbProperties.kt
new file mode 100644
index 00000000..3e6c146e
--- /dev/null
+++ b/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/BoudiccaEventDbProperties.kt
@@ -0,0 +1,18 @@
+package base.boudicca.eventdb
+
+import org.springframework.boot.context.properties.ConfigurationProperties
+
+@ConfigurationProperties(prefix = "boudicca")
+data class BoudiccaEventDbProperties(
+    val store: Store,
+    val ingest: Ingest,
+    val entryKeyNames: List<String>?,
+)
+
+data class Store(
+    val path: String?
+)
+
+data class Ingest(
+    val password: String?
+)
\ No newline at end of file
diff --git a/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/EventDBApplication.kt b/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/EventDBApplication.kt
index d56a882d..621c970f 100644
--- a/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/EventDBApplication.kt
+++ b/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/EventDBApplication.kt
@@ -2,8 +2,8 @@ package base.boudicca.eventdb
 
 import io.swagger.v3.oas.annotations.OpenAPIDefinition
 import io.swagger.v3.oas.annotations.servers.Server
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.boot.autoconfigure.SpringBootApplication
+import org.springframework.boot.context.properties.EnableConfigurationProperties
 import org.springframework.boot.runApplication
 import org.springframework.context.annotation.Bean
 import org.springframework.scheduling.annotation.EnableScheduling
@@ -23,6 +23,7 @@ import org.springframework.web.servlet.config.annotation.WebMvcConfigurer
 )
 @SpringBootApplication
 @EnableScheduling
+@EnableConfigurationProperties(BoudiccaEventDbProperties::class)
 class EventDBApplication : WebMvcConfigurer {
 
     @Bean
@@ -44,10 +45,10 @@ class EventDBApplication : WebMvcConfigurer {
 
     //TODO this really should be done better....
     @Bean
-    fun users(@Value("\${boudicca.ingest.password}") ingestPassword: String): UserDetailsService {
+    fun users(boudiccaEventDbProperties: BoudiccaEventDbProperties): UserDetailsService {
         val ingestUser = User.builder()
             .username("ingest")
-            .password("{noop}" + ingestPassword)
+            .password("{noop}" + boudiccaEventDbProperties.ingest.password)
             .roles("INGEST")
             .build()
         return InMemoryUserDetailsManager(ingestUser)
diff --git a/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/model/Event.kt b/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/model/Event.kt
index 2321dc96..af4105d3 100644
--- a/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/model/Event.kt
+++ b/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/model/Event.kt
@@ -8,12 +8,7 @@ data class Event(
     val data: Map<String, String>? = mapOf()
 )
 
-data class EventKey(
-    val name: String,
-    val startDate: ZonedDateTime,
-) {
-    constructor(event: Event) : this(event.name, event.startDate)
-}
+typealias EntryKey = Map<String, String>
 
 data class InternalEventProperties(
     val timeAdded: Long
diff --git a/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/service/EventService.kt b/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/service/EventService.kt
index 527afe3b..73ecfeae 100644
--- a/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/service/EventService.kt
+++ b/boudicca.base/eventdb/src/main/kotlin/base/boudicca/eventdb/service/EventService.kt
@@ -1,8 +1,9 @@
 package base.boudicca.eventdb.service
 
 import base.boudicca.SemanticKeys
+import base.boudicca.eventdb.BoudiccaEventDbProperties
+import base.boudicca.eventdb.model.EntryKey
 import base.boudicca.eventdb.model.Event
-import base.boudicca.eventdb.model.EventKey
 import base.boudicca.eventdb.model.InternalEventProperties
 import com.fasterxml.jackson.core.type.TypeReference
 import com.fasterxml.jackson.databind.DatabindException
@@ -12,7 +13,6 @@ import com.fasterxml.jackson.module.kotlin.KotlinModule
 import jakarta.annotation.PreDestroy
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
-import org.springframework.beans.factory.annotation.Value
 import org.springframework.beans.factory.config.ConfigurableBeanFactory
 import org.springframework.context.annotation.Scope
 import org.springframework.scheduling.annotation.Scheduled
@@ -21,6 +21,7 @@ import java.io.IOException
 import java.nio.file.Path
 import java.nio.file.StandardOpenOption
 import java.time.Duration
+import java.time.format.DateTimeFormatter
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.TimeUnit
 import java.util.concurrent.atomic.AtomicBoolean
@@ -32,10 +33,12 @@ import kotlin.io.path.writeBytes
 
 @Service
 @Scope(ConfigurableBeanFactory.SCOPE_SINGLETON) //even if this is the default, we REALLY have to make sure there is only one
-class EventService @Autowired constructor(@Value("\${boudicca.store.path}") private val storePath: String) {
+class EventService @Autowired constructor(
+    private val boudiccaEventDbProperties: BoudiccaEventDbProperties
+) {
 
     private val LOG = LoggerFactory.getLogger(this::class.java)
-    private val events = ConcurrentHashMap<EventKey, Pair<Event, InternalEventProperties>>()
+    private val events = ConcurrentHashMap<EntryKey, Pair<Event, InternalEventProperties>>()
     private val lastSeenCollectors = ConcurrentHashMap<String, Long>()
     private val persistLock = ReentrantLock()
     private val needsPersist = AtomicBoolean(false)
@@ -43,8 +46,8 @@ class EventService @Autowired constructor(@Value("\${boudicca.store.path}") priv
         .addModule(KotlinModule.Builder().build()).build()
 
     init {
-        if (storePath.isNotBlank()) {
-            val store = Path.of(storePath)
+        if (!boudiccaEventDbProperties.store.path.isNullOrBlank()) {
+            val store = Path.of(boudiccaEventDbProperties.store.path)
             if (store.exists()) {
                 try {
                     val storeRead = objectMapper.readValue(
@@ -52,7 +55,7 @@ class EventService @Autowired constructor(@Value("\${boudicca.store.path}") priv
                         object : TypeReference<List<Pair<Event, InternalEventProperties>>>() {})
 
                     storeRead.forEach {
-                        events[EventKey(it.first)] = it
+                        events[getEntryKey(it.first)] = it
                     }
 
                     needsPersist.set(false)
@@ -81,7 +84,7 @@ class EventService @Autowired constructor(@Value("\${boudicca.store.path}") priv
     }
 
     fun add(event: Event) {
-        val eventKey = EventKey(event)
+        val eventKey = getEntryKey(event)
         val duplicate = events[eventKey]
         //some cheap logging for finding duplicate events between different collectors
         if (duplicate != null && duplicate.first.data?.get(SemanticKeys.COLLECTORNAME) != event.data?.get(
@@ -114,7 +117,7 @@ class EventService @Autowired constructor(@Value("\${boudicca.store.path}") priv
 
         toRemoveEvents.forEach {
             LOG.debug("removing event because it got too old: {}", it)
-            events.remove(EventKey(it.first))
+            events.remove(getEntryKey(it.first))
             needsPersist.set(true)
         }
     }
@@ -138,7 +141,7 @@ class EventService @Autowired constructor(@Value("\${boudicca.store.path}") priv
     }
 
     fun persist() {
-        if (storePath.isBlank()) {
+        if (boudiccaEventDbProperties.store.path.isNullOrBlank()) {
             return
         }
         persistLock.lock()
@@ -146,7 +149,7 @@ class EventService @Autowired constructor(@Value("\${boudicca.store.path}") priv
             if (needsPersist.get()) {
                 val bytes = objectMapper.writeValueAsBytes(events.values)
                 try {
-                    Path.of(storePath)
+                    Path.of(boudiccaEventDbProperties.store.path)
                         .writeBytes(bytes, StandardOpenOption.TRUNCATE_EXISTING, StandardOpenOption.CREATE)
                 } catch (e: IOException) {
                     LOG.error("error persisting store", e)
@@ -157,4 +160,20 @@ class EventService @Autowired constructor(@Value("\${boudicca.store.path}") priv
             persistLock.unlock()
         }
     }
+
+    private fun getEntryKey(event: Event): EntryKey {
+        val data = event.data?.toMutableMap() ?: mutableMapOf()
+        data[SemanticKeys.NAME] = event.name
+        data[SemanticKeys.STARTDATE] = DateTimeFormatter.ISO_DATE_TIME.format(event.startDate)
+
+        val keys =
+            if (!boudiccaEventDbProperties.entryKeyNames.isNullOrEmpty()) {
+                boudiccaEventDbProperties.entryKeyNames
+            } else {
+                data.keys
+            }
+
+        @Suppress("UNCHECKED_CAST")
+        return keys.map { it to data[it] }.filter { it.second != null }.toMap() as EntryKey
+    }
 }
diff --git a/boudicca.base/eventdb/src/main/resources/application.properties b/boudicca.base/eventdb/src/main/resources/application.properties
index b9824a10..ae2dd91f 100644
--- a/boudicca.base/eventdb/src/main/resources/application.properties
+++ b/boudicca.base/eventdb/src/main/resources/application.properties
@@ -1,4 +1,5 @@
 server.port=8081
 #this is the default and should be overwritten of course
 boudicca.ingest.password=ingest
-boudicca.store.path=
\ No newline at end of file
+boudicca.store.path=
+boudicca.entryKeyNames=
\ No newline at end of file
diff --git a/boudicca.base/ingest-api/build.gradle.kts b/boudicca.base/ingest-api/build.gradle.kts
new file mode 100644
index 00000000..d42f4741
--- /dev/null
+++ b/boudicca.base/ingest-api/build.gradle.kts
@@ -0,0 +1,26 @@
+plugins {
+    kotlin("jvm")
+    kotlin("plugin.allopen")
+}
+
+repositories {
+    mavenCentral()
+    mavenLocal()
+}
+
+dependencies {
+    api(project(":boudicca.base:semantic-conventions"))
+    implementation("org.jetbrains.kotlin:kotlin-stdlib")
+    implementation(project(":boudicca.base:eventdb-openapi"))
+}
+
+java {
+    toolchain {
+        languageVersion.set(JavaLanguageVersion.of(17))
+        vendor.set(JvmVendorSpec.ADOPTIUM)
+    }
+}
+
+tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
+    kotlinOptions.javaParameters = true
+}
diff --git a/boudicca.base/ingest-api/src/main/kotlin/base/boudicca/api/eventdb/ingest/EventDB.kt b/boudicca.base/ingest-api/src/main/kotlin/base/boudicca/api/eventdb/ingest/EventDB.kt
new file mode 100644
index 00000000..b3cbd7fb
--- /dev/null
+++ b/boudicca.base/ingest-api/src/main/kotlin/base/boudicca/api/eventdb/ingest/EventDB.kt
@@ -0,0 +1,48 @@
+package base.boudicca.api.eventdb.ingest
+
+import base.boudicca.Event
+import events.boudicca.openapi.ApiClient
+import events.boudicca.openapi.api.EventIngestionResourceApi
+import java.util.*
+
+class EventDB(eventDbUrl: String, user: String, password: String) {
+
+    private val ingestApi: EventIngestionResourceApi
+
+    init {
+        if (eventDbUrl.isBlank()) {
+            throw IllegalStateException("you need to pass an eventDbUrl!")
+        }
+        if (user.isBlank()) {
+            throw IllegalStateException("you need to pass an user!")
+        }
+        if (password.isBlank()) {
+            throw IllegalStateException("you need to pass an password!")
+        }
+        val apiClient = ApiClient()
+        apiClient.updateBaseUri(eventDbUrl)
+        apiClient.setRequestInterceptor {
+            it.header(
+                "Authorization",
+                "Basic " + Base64.getEncoder()
+                    .encodeToString(
+                        ("$user:$password").encodeToByteArray()
+                    )
+            )
+        }
+        ingestApi = EventIngestionResourceApi(apiClient)
+    }
+
+    fun ingestEvents(events: List<Event>) {
+        for (event in events) {
+            ingestApi.ingestAddPost(mapToRemoteEvent(event))
+        }
+    }
+
+    private fun mapToRemoteEvent(event: Event): events.boudicca.openapi.model.Event {
+        return events.boudicca.openapi.model.Event()
+            .name(event.name)
+            .startDate(event.startDate)
+            .data(event.data)
+    }
+}
\ No newline at end of file
diff --git a/boudicca.base/publisher-api/build.gradle.kts b/boudicca.base/publisher-api/build.gradle.kts
index 38e7810f..d42f4741 100644
--- a/boudicca.base/publisher-api/build.gradle.kts
+++ b/boudicca.base/publisher-api/build.gradle.kts
@@ -9,8 +9,9 @@ repositories {
 }
 
 dependencies {
+    api(project(":boudicca.base:semantic-conventions"))
     implementation("org.jetbrains.kotlin:kotlin-stdlib")
-    api(project(":boudicca.base:eventdb-openapi"))
+    implementation(project(":boudicca.base:eventdb-openapi"))
 }
 
 java {
diff --git a/boudicca.base/publisher-api/src/main/kotlin/base/boudicca/api/eventdb/publisher/EventDB.kt b/boudicca.base/publisher-api/src/main/kotlin/base/boudicca/api/eventdb/publisher/EventDB.kt
new file mode 100644
index 00000000..9053133b
--- /dev/null
+++ b/boudicca.base/publisher-api/src/main/kotlin/base/boudicca/api/eventdb/publisher/EventDB.kt
@@ -0,0 +1,25 @@
+package base.boudicca.api.eventdb.publisher
+
+import base.boudicca.Event
+import events.boudicca.openapi.ApiClient
+import events.boudicca.openapi.api.EventPublisherResourceApi
+
+class EventDB(eventDbUrl: String) {
+
+    private val publisherApi: EventPublisherResourceApi
+
+    init {
+        if (eventDbUrl.isBlank()) {
+            throw IllegalStateException("you need to pass an eventDbUrl!")
+        }
+        val apiClient = ApiClient()
+        apiClient.updateBaseUri(eventDbUrl)
+        publisherApi = EventPublisherResourceApi(apiClient)
+    }
+
+    fun getAllEvents(): List<Event> {
+        val events = publisherApi.eventsGet()
+
+        return events.map { Event(it.name, it.startDate, it.data ?: emptyMap()) }
+    }
+}
\ No newline at end of file
diff --git a/boudicca.base/publisher-event-html/src/main/kotlin/base/boudicca/publisher/event/html/service/EventService.kt b/boudicca.base/publisher-event-html/src/main/kotlin/base/boudicca/publisher/event/html/service/EventService.kt
index b03b4474..4f92058a 100644
--- a/boudicca.base/publisher-event-html/src/main/kotlin/base/boudicca/publisher/event/html/service/EventService.kt
+++ b/boudicca.base/publisher-event-html/src/main/kotlin/base/boudicca/publisher/event/html/service/EventService.kt
@@ -1,5 +1,6 @@
 package base.boudicca.publisher.event.html.service
 
+import base.boudicca.Event
 import base.boudicca.SemanticKeys
 import base.boudicca.api.search.BoudiccaQueryBuilder
 import base.boudicca.api.search.BoudiccaQueryBuilder.after
@@ -10,12 +11,10 @@ import base.boudicca.api.search.BoudiccaQueryBuilder.durationLonger
 import base.boudicca.api.search.BoudiccaQueryBuilder.durationShorter
 import base.boudicca.api.search.BoudiccaQueryBuilder.equals
 import base.boudicca.api.search.BoudiccaQueryBuilder.isQuery
+import base.boudicca.api.search.QueryDTO
+import base.boudicca.api.search.Search
+import base.boudicca.api.search.SearchResultDTO
 import base.boudicca.publisher.event.html.model.SearchDTO
-import base.boudicca.search.openapi.ApiClient
-import base.boudicca.search.openapi.api.SearchResourceApi
-import base.boudicca.search.openapi.model.Event
-import base.boudicca.search.openapi.model.QueryDTO
-import base.boudicca.search.openapi.model.SearchResultDTO
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
 import org.springframework.stereotype.Service
@@ -32,13 +31,13 @@ const val DEFAULT_DURATION_SHORTER_VALUE = 24 * 30
 private const val SEARCH_TYPE_ALL = "ALL"
 
 @Service
-class EventService @Autowired constructor(@Value("\${boudicca.search.url}") private val search: String) {
-    private val searchApi: SearchResourceApi = createSearchApi()
+class EventService @Autowired constructor(@Value("\${boudicca.search.url}") private val searchUrl: String) {
+    private val search: Search = createSearchApi()
     private val formatter = DateTimeFormatter.ofPattern("dd.MM.yyyy 'um' HH:mm 'Uhr'", Locale.GERMAN)
     private val localDateFormatter = DateTimeFormatter.ofPattern("yyyy-MM-dd")
 
     fun search(searchDTO: SearchDTO): List<Map<String, String?>> {
-        val events = searchApi.queryPost(QueryDTO().query(generateQuery(searchDTO)).offset(searchDTO.offset))
+        val events = search.searchQuery(QueryDTO(generateQuery(searchDTO), searchDTO.offset ?: 0))
         return mapEvents(events)
     }
 
@@ -86,7 +85,7 @@ class EventService @Autowired constructor(@Value("\${boudicca.search.url}") priv
     }
 
     fun filters(): Filters {
-        val filters = searchApi.filtersGet()
+        val filters = search.getFilters()
         return Filters(
             filters.categories
                 .map { Pair(it, frontEndName(it)) }
@@ -126,10 +125,8 @@ class EventService @Autowired constructor(@Value("\${boudicca.search.url}") priv
         return formatter.format(startDate.atZoneSameInstant(ZoneId.of("Europe/Vienna")))
     }
 
-    private fun createSearchApi(): SearchResourceApi {
-        val apiClient = ApiClient()
-        apiClient.updateBaseUri(search)
-        return SearchResourceApi(apiClient)
+    private fun createSearchApi(): Search {
+        return Search(searchUrl)
     }
 
     private fun frontEndCategoryName(type: base.boudicca.EventCategory): String {
diff --git a/boudicca.base/publisher-event-ical/src/main/kotlin/base/boudicca/publisher/event/ical/CalendarService.kt b/boudicca.base/publisher-event-ical/src/main/kotlin/base/boudicca/publisher/event/ical/CalendarService.kt
index 9761f761..8269d22c 100644
--- a/boudicca.base/publisher-event-ical/src/main/kotlin/base/boudicca/publisher/event/ical/CalendarService.kt
+++ b/boudicca.base/publisher-event-ical/src/main/kotlin/base/boudicca/publisher/event/ical/CalendarService.kt
@@ -1,10 +1,9 @@
 package base.boudicca.publisher.event.ical
 
+import base.boudicca.Event
 import base.boudicca.SemanticKeys
-import base.boudicca.search.openapi.ApiClient
-import base.boudicca.search.openapi.api.SearchResourceApi
-import base.boudicca.search.openapi.model.Event
-import base.boudicca.search.openapi.model.QueryDTO
+import base.boudicca.api.search.QueryDTO
+import base.boudicca.api.search.Search
 import net.fortuna.ical4j.model.Calendar
 import net.fortuna.ical4j.model.DateTime
 import net.fortuna.ical4j.model.component.VEvent
@@ -26,8 +25,8 @@ class CalendarService @Autowired constructor(@Value("\${boudicca.search.url}") p
         calendar.properties.add(Version.VERSION_2_0)
 
         events.forEach { event ->
-            val location = event.data?.get(SemanticKeys.LOCATION_NAME)
-            val endDate = parseEndDate(event.data?.get(SemanticKeys.ENDDATE))
+            val location = event.data[SemanticKeys.LOCATION_NAME]
+            val endDate = parseEndDate(event.data[SemanticKeys.ENDDATE])
             val calendarEvent = createEvent(
                 event.name, event.startDate, location, endDate, 0
             )
@@ -81,12 +80,7 @@ class CalendarService @Autowired constructor(@Value("\${boudicca.search.url}") p
     }
 
     fun getEvents(query: String): ByteArray {
-        val apiClient = ApiClient()
-        apiClient.updateBaseUri(searchUrl)
-        val searchApi = SearchResourceApi(apiClient)
-
-        val events = searchApi.queryPost(QueryDTO().query(query).size(100))
-
+        val events = Search(searchUrl).searchQuery(QueryDTO(query, 100))
         return createCalendar(events.result)
     }
 }
\ No newline at end of file
diff --git a/boudicca.base/search-api/build.gradle.kts b/boudicca.base/search-api/build.gradle.kts
index 1af074ec..614e3f5c 100644
--- a/boudicca.base/search-api/build.gradle.kts
+++ b/boudicca.base/search-api/build.gradle.kts
@@ -9,8 +9,9 @@ repositories {
 }
 
 dependencies {
+    api(project(":boudicca.base:semantic-conventions"))
     implementation("org.jetbrains.kotlin:kotlin-stdlib")
-    api(project(":boudicca.base:search-openapi"))
+    implementation(project(":boudicca.base:search-openapi"))
     testImplementation("org.junit.jupiter:junit-jupiter:5.10.0")
 }
 
diff --git a/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/FiltersDTO.kt b/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/FiltersDTO.kt
new file mode 100644
index 00000000..b9b2212f
--- /dev/null
+++ b/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/FiltersDTO.kt
@@ -0,0 +1,8 @@
+package base.boudicca.api.search
+
+
+data class FiltersDTO(
+    val categories: Set<String> = setOf(),
+    val locationNames: Set<String> = setOf(),
+    val locationCities: Set<String> = setOf(),
+)
diff --git a/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/QueryDTO.kt b/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/QueryDTO.kt
new file mode 100644
index 00000000..52e94e1d
--- /dev/null
+++ b/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/QueryDTO.kt
@@ -0,0 +1,7 @@
+package base.boudicca.api.search
+
+data class QueryDTO(
+    val query: String,
+    val offset: Int,
+    val size: Int = 30,
+)
\ No newline at end of file
diff --git a/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/Search.kt b/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/Search.kt
new file mode 100644
index 00000000..7d485c30
--- /dev/null
+++ b/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/Search.kt
@@ -0,0 +1,55 @@
+package base.boudicca.api.search
+
+import base.boudicca.Event
+import base.boudicca.search.openapi.ApiClient
+import base.boudicca.search.openapi.api.SearchResourceApi
+import base.boudicca.search.openapi.model.Filters
+
+class Search(enricherUrl: String) {
+
+    private val searchApi: SearchResourceApi
+
+    init {
+        if (enricherUrl.isBlank()) {
+            throw IllegalStateException("you need to pass an eventDbUrl!")
+        }
+        val apiClient = ApiClient()
+        apiClient.updateBaseUri(enricherUrl)
+
+        searchApi = SearchResourceApi(apiClient)
+    }
+
+    fun searchQuery(queryDTO: QueryDTO): SearchResultDTO {
+        return mapSearchResultDto(searchApi.queryPost(mapQueryDto(queryDTO)))
+    }
+
+    fun getFilters(): FiltersDTO {
+        return mapToFiltersDTO(searchApi.filtersGet())
+    }
+
+    private fun mapToFiltersDTO(filtersGet: Filters): FiltersDTO {
+        return FiltersDTO(filtersGet.categories, filtersGet.locationNames, filtersGet.locationCities)
+    }
+
+    private fun mapSearchResultDto(searchResultDTO: base.boudicca.search.openapi.model.SearchResultDTO): SearchResultDTO {
+        return SearchResultDTO(searchResultDTO.result.map { toEvent(it) }, searchResultDTO.totalResults ?: -1)
+    }
+
+    private fun mapQueryDto(queryDTO: QueryDTO): base.boudicca.search.openapi.model.QueryDTO {
+        return base.boudicca.search.openapi.model.QueryDTO()
+            .query(queryDTO.query)
+            .offset(queryDTO.offset)
+            .size(queryDTO.size)
+    }
+
+    private fun toEvent(enricherEvent: base.boudicca.search.openapi.model.Event): Event {
+        return Event(enricherEvent.name, enricherEvent.startDate, enricherEvent.data ?: mapOf())
+    }
+
+    private fun mapToEnricherEvent(event: Event): base.boudicca.search.openapi.model.Event {
+        return base.boudicca.search.openapi.model.Event()
+            .name(event.name)
+            .startDate(event.startDate)
+            .data(event.data)
+    }
+}
\ No newline at end of file
diff --git a/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/SearchResultDTO.kt b/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/SearchResultDTO.kt
new file mode 100644
index 00000000..3c47432e
--- /dev/null
+++ b/boudicca.base/search-api/src/main/kotlin/base/boudicca/api/search/SearchResultDTO.kt
@@ -0,0 +1,8 @@
+package base.boudicca.api.search
+
+import base.boudicca.Event
+
+data class SearchResultDTO(
+    val result: List<Event>,
+    val totalResults: Int
+)
diff --git a/boudicca.base/search/build.gradle.kts b/boudicca.base/search/build.gradle.kts
index d9cb1640..ef938d49 100644
--- a/boudicca.base/search/build.gradle.kts
+++ b/boudicca.base/search/build.gradle.kts
@@ -22,7 +22,7 @@ dependencies {
     implementation("org.jetbrains.kotlin:kotlin-reflect")
     implementation("org.springdoc:springdoc-openapi-starter-webmvc-ui:2.2.0")
     implementation(project(":boudicca.base:semantic-conventions"))
-    implementation(project(":boudicca.base:eventdb-openapi"))
+    implementation(project(":boudicca.base:publisher-api"))
     developmentOnly("org.springframework.boot:spring-boot-devtools")
     testImplementation("org.springframework.boot:spring-boot-starter-test")
     testImplementation("org.springframework.security:spring-security-test")
diff --git a/boudicca.base/search/src/main/kotlin/base/boudicca/search/service/SynchronizationService.kt b/boudicca.base/search/src/main/kotlin/base/boudicca/search/service/SynchronizationService.kt
index d42bb8c6..d3a48a87 100644
--- a/boudicca.base/search/src/main/kotlin/base/boudicca/search/service/SynchronizationService.kt
+++ b/boudicca.base/search/src/main/kotlin/base/boudicca/search/service/SynchronizationService.kt
@@ -1,9 +1,7 @@
 package base.boudicca.search.service
 
+import base.boudicca.api.eventdb.publisher.EventDB
 import base.boudicca.search.model.Event
-import events.boudicca.openapi.ApiClient
-import events.boudicca.openapi.ApiException
-import events.boudicca.openapi.api.EventPublisherResourceApi
 import org.slf4j.LoggerFactory
 import org.springframework.beans.factory.annotation.Autowired
 import org.springframework.beans.factory.annotation.Value
@@ -21,7 +19,7 @@ class SynchronizationService @Autowired constructor(
 
     private val LOG = LoggerFactory.getLogger(this.javaClass)
 
-    private val publisherApi: EventPublisherResourceApi = createEventPublisherApi()
+    private val publisherApi: EventDB = createEventPublisherApi()
     private val updateLock = ReentrantLock()
 
     @Scheduled(fixedDelay = 1, timeUnit = TimeUnit.HOURS)
@@ -33,9 +31,9 @@ class SynchronizationService @Autowired constructor(
         updateLock.lock()
         try {
             try {
-                val events = publisherApi.eventsGet().map { toSearchEvent(it) }.toSet()
+                val events = publisherApi.getAllEvents().map { toSearchEvent(it) }.toSet()
                 eventPublisher.publishEvent(EventsUpdatedEvent(events))
-            } catch (e: ApiException) {
+            } catch (e: RuntimeException) {
                 LOG.warn("could not reach eventdb, retrying in 30s", e)
                 //if eventdb is currently down, retry in 30 seconds
                 //this mainly happens when both are deployed at the same time
@@ -49,14 +47,12 @@ class SynchronizationService @Autowired constructor(
         }
     }
 
-    private fun toSearchEvent(event: events.boudicca.openapi.model.Event): Event {
+    private fun toSearchEvent(event: base.boudicca.Event): Event {
         return Event(event.name, event.startDate.toZonedDateTime(), event.data)
     }
 
-    private fun createEventPublisherApi(): EventPublisherResourceApi {
-        val apiClient = ApiClient()
-        apiClient.updateBaseUri(eventDbUrl)
-        return EventPublisherResourceApi(apiClient)
+    private fun createEventPublisherApi(): EventDB {
+        return EventDB(eventDbUrl)
     }
 }
 
diff --git a/boudicca.base/search/src/test/kotlin/base/boudicca/search/query/evaluator/performance/LoadTestDataIntoLocalCore.kt b/boudicca.base/search/src/test/kotlin/base/boudicca/search/query/evaluator/performance/LoadTestDataIntoLocalCore.kt
deleted file mode 100644
index 07d2217d..00000000
--- a/boudicca.base/search/src/test/kotlin/base/boudicca/search/query/evaluator/performance/LoadTestDataIntoLocalCore.kt
+++ /dev/null
@@ -1,52 +0,0 @@
-package base.boudicca.search.query.evaluator.performance
-
-import base.boudicca.SemanticKeys
-import events.boudicca.openapi.ApiClient
-import events.boudicca.openapi.api.EventIngestionResourceApi
-import events.boudicca.openapi.model.Event
-import java.io.FileInputStream
-import java.io.ObjectInputStream
-import java.time.OffsetDateTime
-import java.time.format.DateTimeFormatter
-import java.util.*
-
-@Suppress("UNCHECKED_CAST")
-fun main() {
-    val inStream = ObjectInputStream(FileInputStream("testdata.dump"))
-    val loadedData = inStream.readObject()
-    inStream.close()
-    val (testData, _) = loadedData as Pair<Collection<Map<String, String>>, Map<String, TestDataGenerator.Metadata>>
-
-    val apiClient = ApiClient()
-    apiClient.updateBaseUri("http://localhost:8081")
-    apiClient.setRequestInterceptor {
-        it.header(
-            "Authorization",
-            "Basic " + Base64.getEncoder().encodeToString("ingest:ingest".encodeToByteArray())
-        )
-    }
-    val ingestApi = EventIngestionResourceApi(apiClient)
-
-    val startTime = System.currentTimeMillis()
-    var count = 0
-    for (event in testData) {
-        count++
-        if (count % 1000 == 0) {
-            val currentTimeTaken = System.currentTimeMillis() - startTime
-            println(
-                "count=${count}/${testData.size}, " +
-                        "took ${currentTimeTaken / 1000}s, " +
-                        "will take ~${kotlin.math.ceil(currentTimeTaken / (count.toDouble() / testData.size.toDouble())) / 1000}s"
-            )
-        }
-        val data = event.toMutableMap()
-        val name = data.remove(SemanticKeys.NAME)
-        val startDate = OffsetDateTime.parse(data.remove(SemanticKeys.STARTDATE), DateTimeFormatter.ISO_DATE_TIME)
-        ingestApi.ingestAddPost(
-            Event()
-                .name(name)
-                .startDate(startDate)
-                .data(data)
-        )
-    }
-}
diff --git a/boudicca.base/search/src/test/kotlin/base/boudicca/search/query/evaluator/performance/PerformanceTest.kt b/boudicca.base/search/src/test/kotlin/base/boudicca/search/query/evaluator/performance/PerformanceTest.kt
deleted file mode 100644
index ce4b32e3..00000000
--- a/boudicca.base/search/src/test/kotlin/base/boudicca/search/query/evaluator/performance/PerformanceTest.kt
+++ /dev/null
@@ -1,49 +0,0 @@
-package base.boudicca.search.query.evaluator.performance
-
-import base.boudicca.search.service.query.ContainsExpression
-import base.boudicca.search.service.query.PAGE_ALL
-import base.boudicca.search.service.query.evaluator.EvaluatorUtil
-import base.boudicca.search.service.query.evaluator.SimpleEvaluator
-import java.io.FileInputStream
-import java.io.ObjectInputStream
-import kotlin.random.Random
-
-fun main() {
-    PerformanceTest.run()
-}
-
-object PerformanceTest {
-
-    fun run() {
-        val (testData, metadata) = loadTestData()
-
-        runTest(testData, metadata)
-    }
-
-    private fun runTest(testData: Collection<Map<String, String>>, metadata: Map<String, TestDataGenerator.Metadata>) {
-        val random = Random(123)
-        val evaluator = SimpleEvaluator(testData.map { EvaluatorUtil.toEvent(it) })
-        var count = 0
-        var time = 0L
-        for (i in 1..100) {
-            val field = metadata.entries.random(random)
-            val expression = ContainsExpression(field.key, field.value.words.random(random))
-            val startTime = System.currentTimeMillis()
-            val result = evaluator.evaluate(expression, PAGE_ALL)
-            time += System.currentTimeMillis() - startTime
-            count += result.totalResults
-        }
-        println("simple contains took ${time}ms and found $count results")
-    }
-
-    @Suppress("UNCHECKED_CAST")
-    private fun loadTestData(): Pair<Collection<Map<String, String>>, Map<String, TestDataGenerator.Metadata>> {
-        val startTime = System.currentTimeMillis()
-        val inStream = ObjectInputStream(FileInputStream("testdata.dump"))
-        val testData = inStream.readObject()
-        inStream.close()
-        println("loading took ${System.currentTimeMillis() - startTime}ms")
-        return testData as Pair<Collection<Map<String, String>>, Map<String, TestDataGenerator.Metadata>>
-    }
-
-}
\ No newline at end of file
diff --git a/boudicca.base/search/src/test/kotlin/base/boudicca/search/query/evaluator/performance/TestDataGenerator.kt b/boudicca.base/search/src/test/kotlin/base/boudicca/search/query/evaluator/performance/TestDataGenerator.kt
deleted file mode 100644
index ada62258..00000000
--- a/boudicca.base/search/src/test/kotlin/base/boudicca/search/query/evaluator/performance/TestDataGenerator.kt
+++ /dev/null
@@ -1,106 +0,0 @@
-package base.boudicca.search.query.evaluator.performance
-
-import base.boudicca.SemanticKeys
-import base.boudicca.search.model.Event
-import base.boudicca.search.service.query.evaluator.EvaluatorUtil
-import events.boudicca.openapi.ApiClient
-import events.boudicca.openapi.api.EventPublisherResourceApi
-import java.io.FileOutputStream
-import java.io.ObjectOutputStream
-import java.io.Serializable
-import kotlin.math.max
-import kotlin.math.min
-import kotlin.random.Random
-
-const val WANTED_EVENTS = 100_000
-fun main() {
-    val startTime = System.currentTimeMillis()
-    val testData = TestDataGenerator.getTestData()
-    val out = ObjectOutputStream(FileOutputStream("testdata.dump", false))
-    out.writeObject(testData)
-    out.close()
-    println("generating and saving test data took ${System.currentTimeMillis() - startTime}ms")
-}
-
-object TestDataGenerator {
-
-    fun getTestData(): Pair<Collection<Map<String, String>>, Map<String, Metadata>> {
-        val apiClient = ApiClient()
-        apiClient.updateBaseUri("https://api.boudicca.events")
-        val eventPublisherResourceApi = EventPublisherResourceApi(apiClient)
-
-        val originalEvents = eventPublisherResourceApi.eventsGet()
-        val originalEventsMapped = originalEvents.filterNotNull()
-            .map { EvaluatorUtil.mapEventToMap(Event(it.name, it.startDate.toZonedDateTime(), it.data)) }
-
-        return remixEvents(originalEventsMapped)
-    }
-
-    /**
-     * takes events + remixes them to generate a big amount of test data
-     */
-    private fun remixEvents(events: List<Map<String, String>>): Pair<Collection<Map<String, String>>, Map<String, Metadata>> {
-        val metadata = generateMetaData(events)
-
-        val remixes = mutableListOf<Map<String, String>>()
-        for (i in 1..(WANTED_EVENTS - events.size)) {
-            remixes.add(generateRemix(metadata))
-        }
-        return Pair(events.plus(remixes), metadata)
-    }
-
-    private fun generateRemix(metadata: Map<String, Metadata>): Map<String, String> {
-        val remix = mutableMapOf<String, String>()
-        for (field in metadata.entries) {
-            if (field.value.percentage > Math.random()) {
-                val value = StringBuilder()
-                for (i in 1..(Random.Default.nextInt(field.value.min, field.value.max + 1))) {
-                    value.append(field.value.words.random())
-                    value.append(" ")
-                }
-                remix[field.key] = value.toString().trim()
-            }
-        }
-        return remix
-    }
-
-    /**
-     * metadata is for each field chance of existing, all possible words, min and max amount of words
-     */
-    private fun generateMetaData(events: List<Map<String, String>>): Map<String, Metadata> {
-        val allFields = events.flatMap { it.keys }.toSet()
-        return allFields.associateWith { generateMetaData(events, it) }
-    }
-
-    private fun generateMetaData(events: List<Map<String, String>>, field: String): Metadata {
-        var min = Int.MAX_VALUE
-        var max = Int.MIN_VALUE
-        var count = 0
-        var words = mutableSetOf<String>()
-
-        events
-            .mapNotNull { it[field] }
-            .forEach {
-                val fieldWords = it
-                    .split(" ", "\t", "\n", "\r\n")
-                    .filter(String::isNotBlank) //meh, good enough for this
-
-                count++
-                words.addAll(fieldWords)
-                min = min(min, fieldWords.size)
-                max = max(max, fieldWords.size)
-            }
-        if (field == SemanticKeys.LOCATION_NAME) {
-            max = 3
-            words = words.take(5).toMutableSet()
-        }
-        return Metadata(count.toFloat() / events.size.toFloat(), words.toList(), min, max)
-    }
-
-    data class Metadata(
-        val percentage: Float,
-        val words: List<String>,
-        val min: Int,
-        val max: Int,
-    ) : Serializable
-}
\ No newline at end of file
diff --git a/boudicca.base/semantic-conventions/build.gradle.kts b/boudicca.base/semantic-conventions/build.gradle.kts
index 98242324..1a8cad4e 100644
--- a/boudicca.base/semantic-conventions/build.gradle.kts
+++ b/boudicca.base/semantic-conventions/build.gradle.kts
@@ -19,3 +19,5 @@ java {
 tasks.withType<org.jetbrains.kotlin.gradle.tasks.KotlinCompile> {
     kotlinOptions.javaParameters = true
 }
+
+//TODO rename?
diff --git a/boudicca.base/semantic-conventions/src/main/java/base/boudicca/Entry.kt b/boudicca.base/semantic-conventions/src/main/java/base/boudicca/Entry.kt
new file mode 100644
index 00000000..fd90ec5c
--- /dev/null
+++ b/boudicca.base/semantic-conventions/src/main/java/base/boudicca/Entry.kt
@@ -0,0 +1,3 @@
+package base.boudicca;
+
+typealias Entry = Map<String, String>
diff --git a/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/Event.kt b/boudicca.base/semantic-conventions/src/main/java/base/boudicca/Event.kt
similarity index 55%
rename from boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/Event.kt
rename to boudicca.base/semantic-conventions/src/main/java/base/boudicca/Event.kt
index 7f46312b..476be111 100644
--- a/boudicca.base/eventcollector-api/src/main/kotlin/base/boudicca/api/eventcollector/Event.kt
+++ b/boudicca.base/semantic-conventions/src/main/java/base/boudicca/Event.kt
@@ -1,9 +1,9 @@
-package base.boudicca.api.eventcollector
+package base.boudicca
 
 import java.time.OffsetDateTime
 
 data class Event(
     val name: String,
     val startDate: OffsetDateTime,
-    val additionalData: Map<String, String>
-)
+    val data: Map<String, String> = mapOf()
+)
\ No newline at end of file
diff --git a/boudicca.events/eventcollectors/build.gradle.kts b/boudicca.events/eventcollectors/build.gradle.kts
index d041f584..74e30d57 100644
--- a/boudicca.events/eventcollectors/build.gradle.kts
+++ b/boudicca.events/eventcollectors/build.gradle.kts
@@ -9,6 +9,7 @@ repositories {
 dependencies {
     implementation("org.jetbrains.kotlin:kotlin-stdlib")
     implementation(project(":boudicca.base:eventcollector-api"))
+    implementation(project(":boudicca.base:publisher-api"))
     implementation("org.jsoup:jsoup:1.16.2")
     implementation("org.mnode.ical4j:ical4j:3.2.13") {
         exclude("org.codehaus.groovy", "groovy")
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/BoudiccaCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/BoudiccaCollector.kt
index f616bc1b..e1206ccf 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/BoudiccaCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/BoudiccaCollector.kt
@@ -1,9 +1,8 @@
 package events.boudicca.eventcollector.collectors
 
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.EventCollector
-import events.boudicca.openapi.ApiClient
-import events.boudicca.openapi.api.EventPublisherResourceApi
+import base.boudicca.api.eventdb.publisher.EventDB
 
 class BoudiccaCollector(private val from: String) : EventCollector {
     override fun getName(): String {
@@ -11,9 +10,6 @@ class BoudiccaCollector(private val from: String) : EventCollector {
     }
 
     override fun collectEvents(): List<Event> {
-        val apiClient = ApiClient()
-        apiClient.updateBaseUri(from)
-        val publisherApi = EventPublisherResourceApi(apiClient)
-        return publisherApi.eventsGet().map { Event(it.name, it.startDate, it.data!!) }
+        return EventDB(from).getAllEvents()
     }
 }
\ No newline at end of file
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/BrucknerhausCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/BrucknerhausCollector.kt
index f1879617..4a0c776a 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/BrucknerhausCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/BrucknerhausCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/EnnsEventsCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/EnnsEventsCollector.kt
index 580f4f90..01cdb1c9 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/EnnsEventsCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/EnnsEventsCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import com.beust.klaxon.JsonObject
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/GewaexhausCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/GewaexhausCollector.kt
index a34753d1..e05b5a07 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/GewaexhausCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/GewaexhausCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/InnovationsHauptplatzCodingWeeksCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/InnovationsHauptplatzCodingWeeksCollector.kt
index 19833e84..4f6a61b5 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/InnovationsHauptplatzCodingWeeksCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/InnovationsHauptplatzCodingWeeksCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/JkuEventCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/JkuEventCollector.kt
index b448211b..dd47c536 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/JkuEventCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/JkuEventCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.EventCollector
 import base.boudicca.api.eventcollector.Fetcher
 import net.fortuna.ical4j.data.CalendarBuilder
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/KapuCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/KapuCollector.kt
index 90e841a0..483cd666 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/KapuCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/KapuCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/KupfTicketCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/KupfTicketCollector.kt
index 2066cb3f..c301f9b8 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/KupfTicketCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/KupfTicketCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import com.beust.klaxon.JsonObject
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/LandestheaterLinzCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/LandestheaterLinzCollector.kt
index 5ff9187c..b21dc644 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/LandestheaterLinzCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/LandestheaterLinzCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/LinzTermineCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/LinzTermineCollector.kt
index 2678a83e..f844bd22 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/LinzTermineCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/LinzTermineCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.EventCollector
 import base.boudicca.api.eventcollector.Fetcher
 import org.jsoup.Jsoup
@@ -24,19 +24,19 @@ class LinzTermineCollector : EventCollector {
         return "linz termine"
     }
 
-    override fun collectEvents(): List<base.boudicca.api.eventcollector.Event> {
+    override fun collectEvents(): List<Event> {
         val locations = parseLocations()
         val events = filterEvents(parseEvents())
         val eventWebsites = getEventWebsites(events)
         return mapEvents(events, locations, eventWebsites)
     }
 
-    private fun filterEvents(events: List<Event>): List<Event> {
+    private fun filterEvents(events: List<LinzTermineEvent>): List<LinzTermineEvent> {
         //448552 is the locationId of casino linz, i do not want gambling in my events
         return events.filter { it.locationId != 448552 }
     }
 
-    private fun getEventWebsites(events: List<Event>): Map<String, Document> {
+    private fun getEventWebsites(events: List<LinzTermineEvent>): Map<String, Document> {
         //TODO we may loose some events because either they do not have a linztermine.at link or the linztermine.at link points to a 404... not sure what to do about that
         return events
             .asSequence()
@@ -57,11 +57,11 @@ class LinzTermineCollector : EventCollector {
     }
 
     private fun mapEvents(
-        eventList: List<Event>,
+        eventList: List<LinzTermineEvent>,
         locations: Map<Int, Location>,
         eventWebsites: Map<String, Document>
-    ): List<base.boudicca.api.eventcollector.Event> {
-        val mappedEvents = mutableListOf<base.boudicca.api.eventcollector.Event>()
+    ): List<Event> {
+        val mappedEvents = mutableListOf<Event>()
         for (event in eventList) {
             if (event.dates.isEmpty()) {
                 LOG.warn("event does not contain any dates: $event")
@@ -101,7 +101,7 @@ class LinzTermineCollector : EventCollector {
         return mappedEvents
     }
 
-    private fun parseEvents(): List<Event> {
+    private fun parseEvents(): List<LinzTermineEvent> {
         val formatter = DateTimeFormatter.ofPattern("uuuu-MM-dd kk:mm:ss")
 
         var date = LocalDate.now(ZoneId.of("Europe/Vienna")).atStartOfDay()
@@ -127,7 +127,7 @@ class LinzTermineCollector : EventCollector {
         }.flatMap {
             it.child(0).children().toList()
                 .map {
-                    Event(
+                    LinzTermineEvent(
                         it.attr("id").toInt(),
                         it.select("title").text(),
                         it.select("tags").first()?.child(0)?.text(),
@@ -180,7 +180,7 @@ class LinzTermineCollector : EventCollector {
         val subOf: Int?,
     )
 
-    data class Event(
+    data class LinzTermineEvent(
         val id: Int,
         val name: String,
         val type: String?,
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/OOESeniorenbundCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/OOESeniorenbundCollector.kt
index d6c22b6f..9f8e2470 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/OOESeniorenbundCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/OOESeniorenbundCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/OteloLinzCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/OteloLinzCollector.kt
index fca986dd..638768b9 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/OteloLinzCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/OteloLinzCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/PlanetTTCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/PlanetTTCollector.kt
index 63054a92..73c8c20b 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/PlanetTTCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/PlanetTTCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import com.beust.klaxon.JsonObject
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/PosthofCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/PosthofCollector.kt
index 4c9e4eee..e9b238a9 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/PosthofCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/PosthofCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/SchlachthofCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/SchlachthofCollector.kt
index 5fd85930..2306f5a4 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/SchlachthofCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/SchlachthofCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/SpinnereiCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/SpinnereiCollector.kt
index d35731dc..99cc0217 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/SpinnereiCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/SpinnereiCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/StadtwerkstattCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/StadtwerkstattCollector.kt
index 34ff270b..a5f1bc5b 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/StadtwerkstattCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/StadtwerkstattCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/StiftskonzerteCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/StiftskonzerteCollector.kt
index 834ce811..f3d60a63 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/StiftskonzerteCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/StiftskonzerteCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/TechnologiePlauscherlCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/TechnologiePlauscherlCollector.kt
index 34553afd..79ededb8 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/TechnologiePlauscherlCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/TechnologiePlauscherlCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.EventCollector
 import base.boudicca.api.eventcollector.Fetcher
 import com.rometools.rome.io.SyndFeedInput
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/UlfOoeCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/UlfOoeCollector.kt
index 8d542b78..9f0b94f1 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/UlfOoeCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/UlfOoeCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
+import base.boudicca.Event
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
@@ -50,9 +50,8 @@ class UlfOoeCollector : TwoStepEventCollector<String>("ulfooe") {
 
         val name = eventSite.select("h1").text()
 
-        var startDate = OffsetDateTime.MIN
-        try {
-            startDate = parseDate(eventSite)
+        val startDate = try {
+            parseDate(eventSite)
         } catch (exc: java.time.format.DateTimeParseException) {
             LOG.info("Error in ${fullEventLink}: can't parse date, might be a multi-day event")
             return null
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/WissensturmCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/WissensturmCollector.kt
index 8346171e..1e2a609f 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/WissensturmCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/WissensturmCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/ZuckerfabrikCollector.kt b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/ZuckerfabrikCollector.kt
index ff4bc843..92cd2838 100644
--- a/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/ZuckerfabrikCollector.kt
+++ b/boudicca.events/eventcollectors/src/main/kotlin/events/boudicca/eventcollector/collectors/ZuckerfabrikCollector.kt
@@ -1,7 +1,7 @@
 package events.boudicca.eventcollector.collectors
 
 import base.boudicca.SemanticKeys
-import base.boudicca.api.eventcollector.Event
+import base.boudicca.Event
 import base.boudicca.api.eventcollector.Fetcher
 import base.boudicca.api.eventcollector.TwoStepEventCollector
 import org.jsoup.Jsoup
diff --git a/settings.gradle.kts b/settings.gradle.kts
index 2cd12621..dce15989 100644
--- a/settings.gradle.kts
+++ b/settings.gradle.kts
@@ -2,8 +2,10 @@ include("boudicca.base")
 include("boudicca.events")
 
 include("boudicca.base:enricher")
+include("boudicca.base:enricher-api")
 include("boudicca.base:enricher-openapi")
 include("boudicca.base:enricher-utils")
+include("boudicca.base:ingest-api")
 include("boudicca.base:eventcollector-api")
 include("boudicca.base:eventdb")
 include("boudicca.base:eventdb-openapi")