diff --git a/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannel.java b/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannel.java
index 18051cda..860f566d 100644
--- a/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannel.java
+++ b/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannelFactory.java b/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannelFactory.java
index b3036195..2eb9776f 100644
--- a/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannelFactory.java
+++ b/channel/memory/src/main/java/com/blazebit/notify/channel/memory/MemoryChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/memory/src/main/java/com/blazebit/notify/channel/memory/package-info.java b/channel/memory/src/main/java/com/blazebit/notify/channel/memory/package-info.java
index 9f6f1f28..80e33dbe 100644
--- a/channel/memory/src/main/java/com/blazebit/notify/channel/memory/package-info.java
+++ b/channel/memory/src/main/java/com/blazebit/notify/channel/memory/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannel.java b/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannel.java
index 5bd076d4..335b3f15 100644
--- a/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannel.java
+++ b/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannelFactory.java b/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannelFactory.java
index 196aeccc..cd806aa4 100644
--- a/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannelFactory.java
+++ b/channel/ses/src/main/java/com/blazebit/notify/channel/ses/SesChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/ses/src/main/java/com/blazebit/notify/channel/ses/package-info.java b/channel/ses/src/main/java/com/blazebit/notify/channel/ses/package-info.java
index 9d5e1216..6261cb35 100644
--- a/channel/ses/src/main/java/com/blazebit/notify/channel/ses/package-info.java
+++ b/channel/ses/src/main/java/com/blazebit/notify/channel/ses/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannel.java b/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannel.java
index 8f0fe740..8ca4ab2a 100644
--- a/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannel.java
+++ b/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannelFactory.java b/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannelFactory.java
index 2c0b1d65..bb48c08c 100644
--- a/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannelFactory.java
+++ b/channel/slack/src/main/java/com/blazebit/notify/channel/slack/SlackChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/slack/src/main/java/com/blazebit/notify/channel/slack/package-info.java b/channel/slack/src/main/java/com/blazebit/notify/channel/slack/package-info.java
index b43b21af..60b6e42a 100644
--- a/channel/slack/src/main/java/com/blazebit/notify/channel/slack/package-info.java
+++ b/channel/slack/src/main/java/com/blazebit/notify/channel/slack/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannel.java b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannel.java
index d7e83fdd..cbc6f327 100644
--- a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannel.java
+++ b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFactory.java b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFactory.java
index d70f82f0..f8c2863c 100644
--- a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFactory.java
+++ b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFilter.java b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFilter.java
index 3745f03d..743fed01 100644
--- a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFilter.java
+++ b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelRecipientPatternFilter.java b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelRecipientPatternFilter.java
index 435c60de..9a2b6cf3 100644
--- a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelRecipientPatternFilter.java
+++ b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/SmtpChannelRecipientPatternFilter.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/package-info.java b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/package-info.java
index 49446733..ab01793d 100644
--- a/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/package-info.java
+++ b/channel/smtp/src/main/java/com/blazebit/notify/channel/smtp/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/AbstractSmtpChannelIntegrationTest.java b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/AbstractSmtpChannelIntegrationTest.java
index 60063e54..39cabeb3 100644
--- a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/AbstractSmtpChannelIntegrationTest.java
+++ b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/AbstractSmtpChannelIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/DefaultEmailNotificationRecipient.java b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/DefaultEmailNotificationRecipient.java
index 335e7ed1..24c7b25a 100644
--- a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/DefaultEmailNotificationRecipient.java
+++ b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/DefaultEmailNotificationRecipient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,7 @@
 
 import java.util.Locale;
 import java.util.Objects;
+import java.util.TimeZone;
 
 public class DefaultEmailNotificationRecipient<ID> implements EmailNotificationRecipient<ID> {
 
@@ -50,6 +51,11 @@ public Locale getLocale() {
         return Locale.getDefault();
     }
 
+    @Override
+    public TimeZone getTimeZone() {
+        return TimeZone.getDefault();
+    }
+
     @Override
     public boolean equals(Object o) {
         if (this == o) return true;
diff --git a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/SmtpChannelIntegrationTest.java b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/SmtpChannelIntegrationTest.java
index 31d84ddb..a479da68 100644
--- a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/SmtpChannelIntegrationTest.java
+++ b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/SmtpChannelIntegrationTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/james/module/MessageSearchIndexModule.java b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/james/module/MessageSearchIndexModule.java
index 152fd47c..e5b5c213 100644
--- a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/james/module/MessageSearchIndexModule.java
+++ b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/james/module/MessageSearchIndexModule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/util/ImapMailClient.java b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/util/ImapMailClient.java
index bc37fe28..2462866d 100644
--- a/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/util/ImapMailClient.java
+++ b/channel/smtp/src/test/java/com/blazebit/notify/channel/smtp/util/ImapMailClient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-config.xml b/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-config.xml
index fca13d42..003d0801 100644
--- a/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-config.xml
+++ b/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2018 - 2022 Blazebit.
+  Copyright 2018 - 2023 Blazebit.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-suppressions.xml b/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-suppressions.xml
index 3bba4069..04e3455b 100644
--- a/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-suppressions.xml
+++ b/checkstyle-rules/src/main/resources/blaze-notify/checkstyle-suppressions.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2018 - 2022 Blazebit.
+  Copyright 2018 - 2023 Blazebit.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/Channel.java b/core/api/src/main/java/com/blazebit/notify/Channel.java
index 6f607802..65433f01 100644
--- a/core/api/src/main/java/com/blazebit/notify/Channel.java
+++ b/core/api/src/main/java/com/blazebit/notify/Channel.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,6 +27,8 @@
  */
 public interface Channel<R extends NotificationRecipient<?>, M extends NotificationMessage> extends AutoCloseable {
 
+    String SERVICE_PROVIDER_PROPERTY = "serviceProvider";
+
     /**
      * Returns the notification message type class.
      *
diff --git a/core/api/src/main/java/com/blazebit/notify/ChannelFactory.java b/core/api/src/main/java/com/blazebit/notify/ChannelFactory.java
index 1f87c0d4..9d5b1877 100644
--- a/core/api/src/main/java/com/blazebit/notify/ChannelFactory.java
+++ b/core/api/src/main/java/com/blazebit/notify/ChannelFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/ChannelKey.java b/core/api/src/main/java/com/blazebit/notify/ChannelKey.java
index c59b69f3..9a584fd8 100644
--- a/core/api/src/main/java/com/blazebit/notify/ChannelKey.java
+++ b/core/api/src/main/java/com/blazebit/notify/ChannelKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/ConfigurationSourceProvider.java b/core/api/src/main/java/com/blazebit/notify/ConfigurationSourceProvider.java
index 1d48894a..fd9b30bc 100644
--- a/core/api/src/main/java/com/blazebit/notify/ConfigurationSourceProvider.java
+++ b/core/api/src/main/java/com/blazebit/notify/ConfigurationSourceProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/Notification.java b/core/api/src/main/java/com/blazebit/notify/Notification.java
index da23b746..a1ca51d1 100644
--- a/core/api/src/main/java/com/blazebit/notify/Notification.java
+++ b/core/api/src/main/java/com/blazebit/notify/Notification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationException.java b/core/api/src/main/java/com/blazebit/notify/NotificationException.java
index 433b9200..3ad63a60 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationException.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJob.java b/core/api/src/main/java/com/blazebit/notify/NotificationJob.java
index c401be0b..5fb93516 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationJob.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobContext.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobContext.java
index 037332b3..d33cef42 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationJobContext.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationJobContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -625,7 +625,12 @@ public <T extends NotificationMessage> NotificationMessageResolver<T> getNotific
                         if (channelFactory == null) {
                             throw new NotificationException("No channel factory for channel key available: " + channelKey);
                         }
-                        return channelFactory.createChannel(this, configurationSource);
+                        return channelFactory.createChannel(this, (key) -> {
+                            if (Channel.SERVICE_PROVIDER_PROPERTY.equals(key)) {
+                                return this;
+                            }
+                            return configurationSource.getProperty(key);
+                        });
                     }
                 );
             }
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobInstance.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobInstance.java
index d33b3420..7a81b2aa 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationJobInstance.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationJobInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessor.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessor.java
index a2931c27..0d22d5c1 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessor.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessorFactory.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessorFactory.java
index 5a9af313..ffd93294 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessorFactory.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationJobInstanceProcessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessor.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessor.java
index bf5962cb..e2d982e1 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessor.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessorFactory.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessorFactory.java
index 5160c36b..d2bfb44b 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessorFactory.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationJobProcessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationJobTrigger.java b/core/api/src/main/java/com/blazebit/notify/NotificationJobTrigger.java
index f44cadf0..66f1b4c6 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationJobTrigger.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationJobTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationMessage.java b/core/api/src/main/java/com/blazebit/notify/NotificationMessage.java
index 495ee6ed..67078aa8 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationMessage.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationMessagePart.java b/core/api/src/main/java/com/blazebit/notify/NotificationMessagePart.java
index 380f689e..dfe584d5 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationMessagePart.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationMessagePart.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolver.java b/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolver.java
index bd18b3b9..5e14f599 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolver.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverFactory.java b/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverFactory.java
index e05cbe57..3ac21de6 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverFactory.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverModelCustomizer.java b/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverModelCustomizer.java
index aee2e613..e28a029a 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverModelCustomizer.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationMessageResolverModelCustomizer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationProcessor.java b/core/api/src/main/java/com/blazebit/notify/NotificationProcessor.java
index 974e14dc..326d18d1 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationProcessor.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationProcessorFactory.java b/core/api/src/main/java/com/blazebit/notify/NotificationProcessorFactory.java
index da2b8779..885a6620 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationProcessorFactory.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationProcessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationRecipient.java b/core/api/src/main/java/com/blazebit/notify/NotificationRecipient.java
index 2c4f5288..71802263 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationRecipient.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationRecipient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package com.blazebit.notify;
 
 import java.util.Locale;
+import java.util.TimeZone;
 
 /**
  * A base type for a notification recipient.
@@ -40,15 +41,23 @@ public interface NotificationRecipient<ID> {
      */
     Locale getLocale();
 
+    /**
+     * Returns the time zone for this notification recipient.
+     *
+     * @return the time zone for this notification recipient
+     */
+    TimeZone getTimeZone();
+
     /**
      * Returns a simple notification recipient with the given identifier and locale.
      *
      * @param id The notification recipient identifier
      * @param locale The notification recipient locale
+     * @param timeZone The notification recipient time zone
      * @param <X> The notification recipient identifier type
      * @return a simple notification recipient
      */
-    static <X> NotificationRecipient<X> of(X id, Locale locale) {
+    static <X> NotificationRecipient<X> of(X id, Locale locale, TimeZone timeZone) {
         return new NotificationRecipient<X>() {
             @Override
             public X getId() {
@@ -59,6 +68,11 @@ public X getId() {
             public Locale getLocale() {
                 return locale;
             }
+
+            @Override
+            public TimeZone getTimeZone() {
+                return timeZone;
+            }
         };
     }
 }
diff --git a/core/api/src/main/java/com/blazebit/notify/NotificationRecipientResolver.java b/core/api/src/main/java/com/blazebit/notify/NotificationRecipientResolver.java
index 145f1561..72690efd 100644
--- a/core/api/src/main/java/com/blazebit/notify/NotificationRecipientResolver.java
+++ b/core/api/src/main/java/com/blazebit/notify/NotificationRecipientResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/package-info.java b/core/api/src/main/java/com/blazebit/notify/package-info.java
index 6be8d728..4368f7d8 100644
--- a/core/api/src/main/java/com/blazebit/notify/package-info.java
+++ b/core/api/src/main/java/com/blazebit/notify/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/security/AbstractFileTruststoreProviderFactory.java b/core/api/src/main/java/com/blazebit/notify/security/AbstractFileTruststoreProviderFactory.java
index a5968304..b707765d 100644
--- a/core/api/src/main/java/com/blazebit/notify/security/AbstractFileTruststoreProviderFactory.java
+++ b/core/api/src/main/java/com/blazebit/notify/security/AbstractFileTruststoreProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/security/FileTruststoreProvider.java b/core/api/src/main/java/com/blazebit/notify/security/FileTruststoreProvider.java
index e14777ec..8cd5395d 100644
--- a/core/api/src/main/java/com/blazebit/notify/security/FileTruststoreProvider.java
+++ b/core/api/src/main/java/com/blazebit/notify/security/FileTruststoreProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/security/HostnameVerificationPolicy.java b/core/api/src/main/java/com/blazebit/notify/security/HostnameVerificationPolicy.java
index b80f6784..25585c30 100644
--- a/core/api/src/main/java/com/blazebit/notify/security/HostnameVerificationPolicy.java
+++ b/core/api/src/main/java/com/blazebit/notify/security/HostnameVerificationPolicy.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/security/JSSETruststoreConfigurator.java b/core/api/src/main/java/com/blazebit/notify/security/JSSETruststoreConfigurator.java
index 07e3ca7e..eef780f5 100644
--- a/core/api/src/main/java/com/blazebit/notify/security/JSSETruststoreConfigurator.java
+++ b/core/api/src/main/java/com/blazebit/notify/security/JSSETruststoreConfigurator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/security/TruststoreProvider.java b/core/api/src/main/java/com/blazebit/notify/security/TruststoreProvider.java
index db4bbc55..cb89b46b 100644
--- a/core/api/src/main/java/com/blazebit/notify/security/TruststoreProvider.java
+++ b/core/api/src/main/java/com/blazebit/notify/security/TruststoreProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/security/TruststoreProviderFactory.java b/core/api/src/main/java/com/blazebit/notify/security/TruststoreProviderFactory.java
index b0e1df73..fa8c8eaa 100644
--- a/core/api/src/main/java/com/blazebit/notify/security/TruststoreProviderFactory.java
+++ b/core/api/src/main/java/com/blazebit/notify/security/TruststoreProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/security/package-info.java b/core/api/src/main/java/com/blazebit/notify/security/package-info.java
index 1fbe9798..d49c18d9 100644
--- a/core/api/src/main/java/com/blazebit/notify/security/package-info.java
+++ b/core/api/src/main/java/com/blazebit/notify/security/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/spi/NotificationPartitionKeyProvider.java b/core/api/src/main/java/com/blazebit/notify/spi/NotificationPartitionKeyProvider.java
index 18b6c61a..07d55e23 100644
--- a/core/api/src/main/java/com/blazebit/notify/spi/NotificationPartitionKeyProvider.java
+++ b/core/api/src/main/java/com/blazebit/notify/spi/NotificationPartitionKeyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/spi/NotificationPartitionKeyProviderFactory.java b/core/api/src/main/java/com/blazebit/notify/spi/NotificationPartitionKeyProviderFactory.java
index 5319b997..9f8324c1 100644
--- a/core/api/src/main/java/com/blazebit/notify/spi/NotificationPartitionKeyProviderFactory.java
+++ b/core/api/src/main/java/com/blazebit/notify/spi/NotificationPartitionKeyProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/api/src/main/java/com/blazebit/notify/spi/package-info.java b/core/api/src/main/java/com/blazebit/notify/spi/package-info.java
index e3814039..a99d3b4d 100644
--- a/core/api/src/main/java/com/blazebit/notify/spi/package-info.java
+++ b/core/api/src/main/java/com/blazebit/notify/spi/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/impl/src/main/java/com/blazebit/notify/impl/NotificationProcessorFactoryImpl.java b/core/impl/src/main/java/com/blazebit/notify/impl/NotificationProcessorFactoryImpl.java
index b1e21a67..9318bc29 100644
--- a/core/impl/src/main/java/com/blazebit/notify/impl/NotificationProcessorFactoryImpl.java
+++ b/core/impl/src/main/java/com/blazebit/notify/impl/NotificationProcessorFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/core/impl/src/main/java/com/blazebit/notify/impl/NotificationProcessorImpl.java b/core/impl/src/main/java/com/blazebit/notify/impl/NotificationProcessorImpl.java
index 1167874d..2d92143c 100644
--- a/core/impl/src/main/java/com/blazebit/notify/impl/NotificationProcessorImpl.java
+++ b/core/impl/src/main/java/com/blazebit/notify/impl/NotificationProcessorImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/message/src/main/java/com/blazebit/notify/email/message/Attachment.java b/email/message/src/main/java/com/blazebit/notify/email/message/Attachment.java
index 8a1dbae2..e71db2ef 100644
--- a/email/message/src/main/java/com/blazebit/notify/email/message/Attachment.java
+++ b/email/message/src/main/java/com/blazebit/notify/email/message/Attachment.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/message/src/main/java/com/blazebit/notify/email/message/EmailBody.java b/email/message/src/main/java/com/blazebit/notify/email/message/EmailBody.java
index d2f2a792..425f93f9 100644
--- a/email/message/src/main/java/com/blazebit/notify/email/message/EmailBody.java
+++ b/email/message/src/main/java/com/blazebit/notify/email/message/EmailBody.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessage.java b/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessage.java
index d558e5e1..3f2a9f22 100644
--- a/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessage.java
+++ b/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessageResolver.java b/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessageResolver.java
index b2d8f079..b6570a5d 100644
--- a/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessageResolver.java
+++ b/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessageResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 package com.blazebit.notify.email.message;
 
 import com.blazebit.job.ConfigurationSource;
+import com.blazebit.job.ServiceProvider;
 import com.blazebit.notify.Notification;
 import com.blazebit.notify.NotificationException;
 import com.blazebit.notify.NotificationJobContext;
@@ -68,7 +69,6 @@ public class EmailNotificationMessageResolver implements NotificationMessageReso
      * The configuration property for the E-Mail {@link ResourceBundle}.
      */
     public static final String EMAIL_MESSAGE_RESOURCE_BUNDLE_PROPERTY = "message.email.resource_bundle";
-
     /**
      * The configuration property for the {@link TemplateContext} to use for the subject and body properties.
      */
@@ -76,36 +76,35 @@ public class EmailNotificationMessageResolver implements NotificationMessageReso
     /**
      * The configuration property for the {@link TemplateProcessorFactory} to use for the subject and body properties.
      */
-    public static final String EMAIL_TEMPLATE_PROCESSOR_FACTORY_PROPERTY = "message.email.template_processor_factory";
-
+    public static final String EMAIL_TEMPLATE_PROCESSOR_TYPE_PROPERTY = "message.email.template_processor_type";
     /**
      * The configuration property for the E-Mail subject.
      */
-    public static final String EMAIL_MESSAGE_SUBJECT_PROPERTY = "message.email.subject";
+    public static final String EMAIL_MESSAGE_SUBJECT_PROPERTY = "message.email.subject.value";
     /**
      * The configuration property for the E-Mail subject template.
      */
-    public static final String EMAIL_MESSAGE_SUBJECT_TEMPLATE_PROPERTY = "message.email.subject_template";
+    public static final String EMAIL_MESSAGE_SUBJECT_TEMPLATE_PROPERTY = "message.email.subject.template";
     /**
      * The configuration property for the E-Mail text body.
      */
-    public static final String EMAIL_MESSAGE_TEXT_PROPERTY = "message.email.text";
+    public static final String EMAIL_MESSAGE_TEXT_PROPERTY = "message.email.body_text.value";
     /**
      * The configuration property for the E-Mail text body template.
      */
-    public static final String EMAIL_MESSAGE_TEXT_TEMPLATE_PROPERTY = "message.email.text_template";
+    public static final String EMAIL_MESSAGE_TEXT_TEMPLATE_PROPERTY = "message.email.body_text.template";
     /**
      * The configuration property for the E-Mail html body.
      */
-    public static final String EMAIL_MESSAGE_HTML_PROPERTY = "message.email.html";
+    public static final String EMAIL_MESSAGE_HTML_PROPERTY = "message.email.body_html.value";
     /**
      * The configuration property for the E-Mail html body template.
      */
-    public static final String EMAIL_MESSAGE_HTML_TEMPLATE_PROPERTY = "message.email.html_template";
+    public static final String EMAIL_MESSAGE_HTML_TEMPLATE_PROPERTY = "message.email.body_html.template";
     /**
-     * The configuration property for the E-Mail attachment processors.
+     * The configuration property for the E-Mail attachment templates.
      */
-    public static final String EMAIL_MESSAGE_ATTACHMENT_PROCESSORS_PROPERTY = "message.email.attachment_processors";
+    public static final String EMAIL_MESSAGE_ATTACHMENT_TEMPLATES_PROPERTY = "message.email.attachment.templates";
 
     private final NotificationJobContext notificationJobContext;
     private final String from;
@@ -135,35 +134,56 @@ public EmailNotificationMessageResolver(NotificationJobContext jobContext, Confi
         this.envelopeFrom = configurationSource.getPropertyOrDefault(EMAIL_MESSAGE_ENVELOP_FROM_PROPERTY, String.class, Function.identity(), o -> null);
         this.resourceBundleAccessor = configurationSource.getPropertyOrDefault(EMAIL_MESSAGE_RESOURCE_BUNDLE_PROPERTY, Function.class, EmailNotificationMessageResolver::resourceBundleByName, o -> null);
         TemplateContext templateContext = configurationSource.getPropertyOrDefault(EMAIL_TEMPLATE_CONTEXT_PROPERTY, TemplateContext.class, null, o -> jobContext.getService(TemplateContext.class));
-        TemplateProcessorFactory templateProcessorFactory = configurationSource.getPropertyOrDefault(EMAIL_TEMPLATE_PROCESSOR_FACTORY_PROPERTY, TemplateProcessorFactory.class, s -> {
+        TemplateProcessorFactory<String> templateProcessorFactory = configurationSource.getPropertyOrDefault(
+            EMAIL_TEMPLATE_PROCESSOR_TYPE_PROPERTY, TemplateProcessorFactory.class, s -> {
             if (templateContext == null) {
                 throw new NotificationException("No template context given!");
             }
             return templateContext.getTemplateProcessorFactory(s, String.class);
         }, o -> null);
-        Function<String, TemplateProcessor> templateProcessorFunction = templateName -> templateProcessorByName(notificationJobContext, templateContext, templateProcessorFactory, configurationSource, templateName);
+        Function<String, TemplateProcessorFactory<Attachment>> attachmentTemplateProcessorFactory = templateProcessorFactoryKey -> {
+            if (templateContext == null) {
+                throw new NotificationException("No template context given!");
+            }
+            return templateContext.getTemplateProcessorFactory(templateProcessorFactoryKey, Attachment.class);
+        };
+        Function<String, TemplateProcessor<String>> templateProcessorFunction = templateName ->
+            templateProcessorByType(
+                templateContext,
+                templateProcessorFactory,
+                configurationSource,
+                templateName,
+                jobContext);
+        Function<String, TemplateProcessor<Attachment>> attachmentTemplateProcessorFunction = templateProcessorType -> templateProcessorByType(
+            templateContext,
+            attachmentTemplateProcessorFactory.apply(templateProcessorType),
+            configurationSource,
+            null,
+            jobContext);
         String literalSubject = (String) configurationSource.getProperty(EMAIL_MESSAGE_SUBJECT_PROPERTY);
         this.subjectTemplateProcessor = literalSubject == null ? templateProcessorFunction.apply((String) configurationSource.getProperty(EMAIL_MESSAGE_SUBJECT_TEMPLATE_PROPERTY)) : TemplateProcessor.of(literalSubject);
         String literalBodyText = (String) configurationSource.getProperty(EMAIL_MESSAGE_TEXT_PROPERTY);
         this.textBodyTemplateProcessor = literalBodyText == null ? templateProcessorFunction.apply((String) configurationSource.getProperty(EMAIL_MESSAGE_TEXT_TEMPLATE_PROPERTY)) : TemplateProcessor.of(literalBodyText);
         String literalBodyHtml = (String) configurationSource.getProperty(EMAIL_MESSAGE_HTML_PROPERTY);
         this.htmlBodyTemplateProcessor = literalBodyHtml == null ? templateProcessorFunction.apply((String) configurationSource.getProperty(EMAIL_MESSAGE_HTML_TEMPLATE_PROPERTY)) : TemplateProcessor.of(literalBodyHtml);
-        Object o = configurationSource.getProperty(EMAIL_MESSAGE_ATTACHMENT_PROCESSORS_PROPERTY);
+        Object o = configurationSource.getProperty(EMAIL_MESSAGE_ATTACHMENT_TEMPLATES_PROPERTY);
         List<TemplateProcessor<Attachment>> attachmentProcessors = Collections.emptyList();
         if (o instanceof Collection<?>) {
             Collection<?> collection = (Collection<?>) o;
             attachmentProcessors = new ArrayList<>(collection.size());
             for (Object element : collection) {
                 if (element instanceof String) {
-                    attachmentProcessors.add(templateProcessorFunction.apply((String) element));
+                    attachmentProcessors.add(attachmentTemplateProcessorFunction.apply((String) element));
                 } else {
-                    throw new NotificationException("Invalid attachment processor given via property '" + EMAIL_MESSAGE_ATTACHMENT_PROCESSORS_PROPERTY + "': " + element);
+                    throw new NotificationException("Invalid attachment processor given via property '" + EMAIL_MESSAGE_ATTACHMENT_TEMPLATES_PROPERTY
+                        + "': " + element);
                 }
             }
         } else if (o instanceof String) {
-            attachmentProcessors = Collections.singletonList(templateProcessorFunction.apply((String) o));
+            attachmentProcessors = Collections.singletonList(attachmentTemplateProcessorFunction.apply((String) o));
         } else if (o != null) {
-            throw new NotificationException("Invalid attachment processors given via property '" + EMAIL_MESSAGE_ATTACHMENT_PROCESSORS_PROPERTY + "': " + o);
+            throw new NotificationException("Invalid attachment processors given via property '" + EMAIL_MESSAGE_ATTACHMENT_TEMPLATES_PROPERTY
+                + "': " + o);
         }
         this.attachmentProcessors = attachmentProcessors;
         this.modelCustomizers = modelCustomizers == null ? Collections.emptyList() : modelCustomizers;
@@ -208,7 +228,7 @@ private static Function<Locale, ResourceBundle> resourceBundleByName(String name
         return locale -> ResourceBundle.getBundle(name, locale);
     }
 
-    private static TemplateProcessor<String> templateProcessorByName(NotificationJobContext jobContext, TemplateContext templateContext, TemplateProcessorFactory<String> templateProcessorFactory, ConfigurationSource configurationSource, String templateName) {
+    private static <T> TemplateProcessor<T> templateProcessorByType(TemplateContext templateContext, TemplateProcessorFactory<T> templateProcessorFactory, ConfigurationSource configurationSource, String templateName, ServiceProvider serviceProvider) {
         if (templateName == null) {
             return null;
         }
@@ -218,13 +238,7 @@ private static TemplateProcessor<String> templateProcessorByName(NotificationJob
         if (templateProcessorFactory == null) {
             throw new NotificationException("No template processor factory given!");
         }
-        return templateProcessorFactory.createTemplateProcessor(templateContext, key -> {
-            if (TemplateProcessor.TEMPLATE_NAME_PROPERTY.equals(key)) {
-                return templateName;
-            }
-            Object value = configurationSource.getProperty(key);
-            return value == null ? jobContext.getProperty(key) : value;
-        });
+        return templateProcessorFactory.createTemplateProcessor(templateContext, templateName, configurationSource::getProperty, serviceProvider);
     }
 
     @Override
@@ -237,6 +251,7 @@ public EmailNotificationMessage resolveNotificationMessage(Notification<?> notif
             model.put("resourceBundle", resourceBundle);
         }
         model.put("locale", locale);
+        model.put("timeZone", notificationRecipient.getTimeZone());
         model.put("recipient", notificationRecipient);
         for (NotificationMessageResolverModelCustomizer modelCustomizer : modelCustomizers) {
             modelCustomizer.customize(model, notification, notificationJobContext);
diff --git a/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessageResolverFactory.java b/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessageResolverFactory.java
index fd5d0efc..3922d068 100644
--- a/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessageResolverFactory.java
+++ b/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationMessageResolverFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationRecipient.java b/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationRecipient.java
index a816f878..45ae17f9 100644
--- a/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationRecipient.java
+++ b/email/message/src/main/java/com/blazebit/notify/email/message/EmailNotificationRecipient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,6 +18,7 @@
 import com.blazebit.notify.NotificationRecipient;
 
 import java.util.Locale;
+import java.util.TimeZone;
 
 /**
  * A base type for a E-Mail notification recipient.
@@ -40,11 +41,12 @@ public interface EmailNotificationRecipient<ID> extends NotificationRecipient<ID
      *
      * @param id     The notification recipient identifier
      * @param locale The notification recipient locale
+     * @param timeZone The notification recipient time zone
      * @param email  The notification recipient E-Mail address
      * @param <X>    The notification recipient identifier type
      * @return a simple notification recipient
      */
-    static <X> EmailNotificationRecipient<X> of(X id, Locale locale, String email) {
+    static <X> EmailNotificationRecipient<X> of(X id, Locale locale, TimeZone timeZone, String email) {
         return new EmailNotificationRecipient<X>() {
             @Override
             public X getId() {
@@ -56,6 +58,11 @@ public Locale getLocale() {
                 return locale;
             }
 
+            @Override
+            public TimeZone getTimeZone() {
+                return timeZone;
+            }
+
             @Override
             public String getEmail() {
                 return email;
diff --git a/email/message/src/main/java/com/blazebit/notify/email/message/EmailSubject.java b/email/message/src/main/java/com/blazebit/notify/email/message/EmailSubject.java
index 157fdcf8..b172448e 100644
--- a/email/message/src/main/java/com/blazebit/notify/email/message/EmailSubject.java
+++ b/email/message/src/main/java/com/blazebit/notify/email/message/EmailSubject.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/message/src/main/java/com/blazebit/notify/email/message/package-info.java b/email/message/src/main/java/com/blazebit/notify/email/message/package-info.java
index 7a2c6dea..c981df7e 100644
--- a/email/message/src/main/java/com/blazebit/notify/email/message/package-info.java
+++ b/email/message/src/main/java/com/blazebit/notify/email/message/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/AbstractEmailNotification.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/AbstractEmailNotification.java
index 66ec97a6..315937b7 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/AbstractEmailNotification.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/AbstractEmailNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,28 +20,19 @@
 import com.blazebit.notify.ConfigurationSourceProvider;
 import com.blazebit.notify.Notification;
 import com.blazebit.notify.NotificationJobContext;
-import com.blazebit.notify.NotificationRecipient;
 import com.blazebit.notify.email.message.Attachment;
-import com.blazebit.notify.email.message.EmailNotificationRecipient;
 import com.blazebit.notify.jpa.model.base.AbstractNotification;
 import com.blazebit.notify.template.api.TemplateProcessor;
-import com.blazebit.notify.template.api.TemplateProcessorKey;
-
+import java.time.Instant;
 import java.util.ArrayList;
 import java.util.List;
 import javax.persistence.Column;
 import javax.persistence.EnumType;
 import javax.persistence.Enumerated;
-import javax.persistence.FetchType;
-import javax.persistence.JoinColumn;
 import javax.persistence.Lob;
-import javax.persistence.ManyToOne;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Transient;
 import javax.validation.constraints.NotNull;
-import java.time.Instant;
-import java.util.Locale;
-import java.util.Map;
 
 /**
  * An abstract mapped superclass implementing the {@link Notification} interface for E-Mail notifications.
@@ -54,51 +45,48 @@
 public abstract class AbstractEmailNotification<ID> extends AbstractNotification<ID> implements ConfigurationSourceProvider {
 
     /**
-     * The parameter name for the template processor type {@link TemplateProcessorKey#getTemplateProcessorResultType()}.
+     * The parameter name for the template processor type {@link com.blazebit.notify.template.api.TemplateProcessorKey#getTemplateProcessorType()}.
      */
-    public static final String TEMPLATE_PROCESSOR_TYPE_PARAMETER_NAME = "templateProcessorType";
+    public static final String TEMPLATE_PROCESSOR_TYPE_PARAMETER = "templateProcessorType";
     /**
      * The parameter name for the subject which is a plain {@link String}.
      * The value represents the literal subject.
      */
-    public static final String SUBJECT_PARAMETER_NAME = "subject";
+    public static final String SUBJECT_PARAMETER = "subject";
     /**
      * The parameter name for the subject template which is a plain {@link String}.
      * The value refers to a template name.
      */
-    public static final String SUBJECT_TEMPLATE_PARAMETER_NAME = "subjectTemplate";
+    public static final String SUBJECT_TEMPLATE_PARAMETER = "subjectTemplate";
     /**
      * The parameter name for the text body which is a plain {@link String}.
      * The value refers to the literal text body.
      */
-    public static final String BODY_TEXT_PARAMETER_NAME = "text";
+    public static final String BODY_TEXT_PARAMETER = "text";
     /**
      * The parameter name for the text body template which is a plain {@link String}.
      * The value refers to a template name.
      */
-    public static final String BODY_TEXT_TEMPLATE_PARAMETER_NAME = "textTemplate";
+    public static final String BODY_TEXT_TEMPLATE_PARAMETER = "textTemplate";
     /**
      * The parameter name for the html body which is a plain {@link String}.
      * The value refers to the literal html body.
      */
-    public static final String BODY_HTML_PARAMETER_NAME = "html";
+    public static final String BODY_HTML_PARAMETER = "html";
     /**
      * The parameter name for the html body template which is a plain {@link String}.
      * The value refers to a template name.
      */
-    public static final String BODY_HTML_TEMPLATE_PARAMETER_NAME = "htmlTemplate";
+    public static final String BODY_HTML_TEMPLATE_PARAMETER = "htmlTemplate";
     /**
      * The parameter name for the attachments which is a collection of plain {@link String}s referring to
-     * template names. The templates are expected to be processed to a collection of {@link Attachment} by a
-     * {@link TemplateProcessor}.
+     * template names. The templates are expected to be processed to a collection of
+     * {@link Attachment} by a {@link TemplateProcessor}.
      */
-    public static final String ATTACHMENTS_PARAMETER_NAME = "attachments";
-
+    public static final String ATTACHMENT_TEMPLATES_PARAMETER = "attachmentTemplates";
     private static final long serialVersionUID = 1L;
 
-    private FromEmail from;
     private Long fromId;
-    private String to;
 
     // The message id of the message for tracking purposes
     private String messageId;
@@ -133,34 +121,28 @@ public void markDone(JobInstanceProcessingContext<?> jobProcessingContext, Objec
         setMessageId((String) result);
     }
 
-    @Override
-    @Transient
-    public NotificationRecipient getRecipient() {
-        return EmailNotificationRecipient.of(to, Locale.getDefault(), to);
-    }
-
     @Override
     public ConfigurationSource getConfigurationSource(NotificationJobContext context) {
         return new EmailNotificationConfigurationSource(this);
     }
 
     /**
-     * Returns the template processor type to use for subject, text body and html body.
+     * Returns the template processor type to use for subject, text body. html body and attachments.
      *
      * @return the template processor type
      */
     @Transient
     public String getTemplateProcessorType() {
-        return (String) getJobConfiguration().getParameters().get(TEMPLATE_PROCESSOR_TYPE_PARAMETER_NAME);
+        return (String) getJobConfiguration().getParameters().get(TEMPLATE_PROCESSOR_TYPE_PARAMETER);
     }
 
     /**
-     * Sets that subject, text body and html body should be processed by a template processor with the given type.
+     * Sets that subject, text body, html body and attachments should be processed by a template processor with the given type.
      *
      * @param templateProcessorType The template processor type
      */
     public void setTemplateProcessorType(String templateProcessorType) {
-        getJobConfiguration().getParameters().put(TEMPLATE_PROCESSOR_TYPE_PARAMETER_NAME, templateProcessorType);
+        getJobConfiguration().getParameters().put(TEMPLATE_PROCESSOR_TYPE_PARAMETER, templateProcessorType);
     }
 
     /**
@@ -170,7 +152,7 @@ public void setTemplateProcessorType(String templateProcessorType) {
      */
     @Transient
     public String getSubjectTemplateName() {
-        return (String) getJobConfiguration().getParameters().get(SUBJECT_TEMPLATE_PARAMETER_NAME);
+        return (String) getJobConfiguration().getParameters().get(SUBJECT_TEMPLATE_PARAMETER);
     }
 
     /**
@@ -179,7 +161,7 @@ public String getSubjectTemplateName() {
      * @param subjectTemplateName The subject template name
      */
     public void setSubjectTemplateName(String subjectTemplateName) {
-        getJobConfiguration().getParameters().put(SUBJECT_TEMPLATE_PARAMETER_NAME, subjectTemplateName);
+        getJobConfiguration().getParameters().put(SUBJECT_TEMPLATE_PARAMETER, subjectTemplateName);
     }
 
     /**
@@ -189,7 +171,7 @@ public void setSubjectTemplateName(String subjectTemplateName) {
      */
     @Transient
     public String getSubject() {
-        return (String) getJobConfiguration().getParameters().get(SUBJECT_PARAMETER_NAME);
+        return (String) getJobConfiguration().getParameters().get(SUBJECT_PARAMETER);
     }
 
     /**
@@ -198,7 +180,7 @@ public String getSubject() {
      * @param subject The subject
      */
     public void setSubject(String subject) {
-        getJobConfiguration().getParameters().put(SUBJECT_PARAMETER_NAME, subject);
+        getJobConfiguration().getParameters().put(SUBJECT_PARAMETER, subject);
     }
 
     /**
@@ -208,7 +190,7 @@ public void setSubject(String subject) {
      */
     @Transient
     public String getBodyTextTemplateName() {
-        return (String) getJobConfiguration().getParameters().get(BODY_TEXT_TEMPLATE_PARAMETER_NAME);
+        return (String) getJobConfiguration().getParameters().get(BODY_TEXT_TEMPLATE_PARAMETER);
     }
 
     /**
@@ -217,7 +199,7 @@ public String getBodyTextTemplateName() {
      * @param bodyTextTemplateName The text body template name
      */
     public void setBodyTextTemplateName(String bodyTextTemplateName) {
-        getJobConfiguration().getParameters().put(BODY_TEXT_TEMPLATE_PARAMETER_NAME, bodyTextTemplateName);
+        getJobConfiguration().getParameters().put(BODY_TEXT_TEMPLATE_PARAMETER, bodyTextTemplateName);
     }
 
     /**
@@ -227,7 +209,7 @@ public void setBodyTextTemplateName(String bodyTextTemplateName) {
      */
     @Transient
     public String getBodyText() {
-        return (String) getJobConfiguration().getParameters().get(BODY_TEXT_PARAMETER_NAME);
+        return (String) getJobConfiguration().getParameters().get(BODY_TEXT_PARAMETER);
     }
 
     /**
@@ -236,7 +218,7 @@ public String getBodyText() {
      * @param bodyText The body text
      */
     public void setBodyText(String bodyText) {
-        getJobConfiguration().getParameters().put(BODY_TEXT_PARAMETER_NAME, bodyText);
+        getJobConfiguration().getParameters().put(BODY_TEXT_PARAMETER, bodyText);
     }
 
     /**
@@ -246,7 +228,7 @@ public void setBodyText(String bodyText) {
      */
     @Transient
     public String getBodyHtmlTemplateName() {
-        return (String) getJobConfiguration().getParameters().get(BODY_HTML_TEMPLATE_PARAMETER_NAME);
+        return (String) getJobConfiguration().getParameters().get(BODY_HTML_TEMPLATE_PARAMETER);
     }
 
     /**
@@ -255,7 +237,7 @@ public String getBodyHtmlTemplateName() {
      * @param bodyHtmlTemplateName The html body template name
      */
     public void setBodyHtmlTemplateName(String bodyHtmlTemplateName) {
-        getJobConfiguration().getParameters().put(BODY_HTML_TEMPLATE_PARAMETER_NAME, bodyHtmlTemplateName);
+        getJobConfiguration().getParameters().put(BODY_HTML_TEMPLATE_PARAMETER, bodyHtmlTemplateName);
     }
 
     /**
@@ -265,7 +247,7 @@ public void setBodyHtmlTemplateName(String bodyHtmlTemplateName) {
      */
     @Transient
     public String getBodyHtml() {
-        return (String) getJobConfiguration().getParameters().get(BODY_HTML_PARAMETER_NAME);
+        return (String) getJobConfiguration().getParameters().get(BODY_HTML_PARAMETER);
     }
 
     /**
@@ -274,7 +256,7 @@ public String getBodyHtml() {
      * @param bodyHtml The body html
      */
     public void setBodyHtml(String bodyHtml) {
-        getJobConfiguration().getParameters().put(BODY_HTML_PARAMETER_NAME, bodyHtml);
+        getJobConfiguration().getParameters().put(BODY_HTML_PARAMETER, bodyHtml);
     }
 
     /**
@@ -283,44 +265,31 @@ public void setBodyHtml(String bodyHtml) {
      * @return the attachment template names
      */
     @Transient
-    public List<Attachment> getAttachmentTemplateNames() {
-        return (List<Attachment>) getJobConfiguration().getParameters().get(ATTACHMENTS_PARAMETER_NAME);
+    public List<Attachment> getAttachmentTemplates() {
+        return (List<Attachment>) getJobConfiguration().getParameters().get(ATTACHMENT_TEMPLATES_PARAMETER);
     }
 
     /**
      * Sets the attachment template names.
      *
-     * @param attachmentTemplateNames The attachment template names
+     * @param attachmentTemplates The attachment template names
      */
-    public void setAttachmentTemplateNames(List<String> attachmentTemplateNames) {
-        getJobConfiguration().getParameters().put(ATTACHMENTS_PARAMETER_NAME, new ArrayList<>(attachmentTemplateNames));
+    public void setAttachmentTemplates(List<String> attachmentTemplates) {
+        getJobConfiguration().getParameters().put(ATTACHMENT_TEMPLATES_PARAMETER, new ArrayList<>(attachmentTemplates));
     }
 
     /**
-     * Returns the {@link FromEmail}.
+     * Returns the {@link AbstractFromEmail}.
      *
-     * @return the {@link FromEmail}
+     * @return the {@link AbstractFromEmail}
      */
-    @NotNull
-    @ManyToOne(fetch = FetchType.LAZY, optional = false)
-    @JoinColumn(name = "from_email", nullable = false)
-    public FromEmail getFrom() {
-        return from;
-    }
-
-    /**
-     * Sets the {@link FromEmail}.
-     *
-     * @param from The {@link FromEmail}
-     */
-    public void setFrom(FromEmail from) {
-        this.from = from;
-    }
+    @Transient
+    public abstract AbstractFromEmail getFrom();
 
     /**
-     * Returns the {@link FromEmail} id.
+     * Returns the {@link AbstractFromEmail} id.
      *
-     * @return the {@link FromEmail} id
+     * @return the {@link AbstractFromEmail} id
      */
     @Column(name = "from_email", nullable = false, insertable = false, updatable = false)
     public Long getFromId() {
@@ -328,34 +297,14 @@ public Long getFromId() {
     }
 
     /**
-     * Sets the {@link FromEmail} id.
+     * Sets the {@link AbstractFromEmail} id.
      *
-     * @param fromId The {@link FromEmail} id
+     * @param fromId The {@link AbstractFromEmail} id
      */
     public void setFromId(Long fromId) {
         this.fromId = fromId;
     }
 
-    /**
-     * Returns the to E-Mail address.
-     *
-     * @return the to E-Mail address
-     */
-    @NotNull
-    @Column(name = "to_email", nullable = false, columnDefinition = ColumnTypes.MAIL_RECIPIENT)
-    public String getTo() {
-        return to;
-    }
-
-    /**
-     * Sets the to E-Mail address.
-     *
-     * @param to The to E-Mail address
-     */
-    public void setTo(String to) {
-        this.to = to;
-    }
-
     /**
      * Returns the message id.
      *
@@ -454,29 +403,4 @@ public EmailNotificationReviewState getReviewState() {
     public void setReviewState(EmailNotificationReviewState reviewState) {
         this.reviewState = reviewState;
     }
-
-    /**
-     * A template processor delegating to a parameter of the model map.
-     *
-     * @author Christian Beikov
-     * @since 1.0.0
-     */
-    private static class ModelGetOrDelegateTemplateProcessor<T> implements TemplateProcessor<T> {
-
-        private final String parameter;
-
-        public ModelGetOrDelegateTemplateProcessor(String parameter) {
-            this.parameter = parameter;
-        }
-
-        @Override
-        public T processTemplate(Map<String, Object> model) {
-            Object o = model.get(parameter);
-            if (o instanceof TemplateProcessor<?>) {
-                return ((TemplateProcessor<T>) o).processTemplate(model);
-            } else {
-                return (T) o;
-            }
-        }
-    }
 }
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/FromEmail.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/AbstractFromEmail.java
similarity index 76%
rename from email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/FromEmail.java
rename to email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/AbstractFromEmail.java
index 7a45e6c9..6066622d 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/FromEmail.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/AbstractFromEmail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,12 +16,7 @@
 package com.blazebit.notify.email.model.jpa;
 
 import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
-import javax.persistence.SequenceGenerator;
-import javax.persistence.Table;
+import javax.persistence.MappedSuperclass;
 import javax.validation.constraints.NotNull;
 
 /**
@@ -30,10 +25,8 @@
  * @author Christian Beikov
  * @since 1.0.0
  */
-@Entity
-@SequenceGenerator(name = "idGenerator", sequenceName = "from_email_seq")
-@Table(name = "from_email")
-public class FromEmail extends BaseEntity<Long> {
+@MappedSuperclass
+public abstract class AbstractFromEmail extends BaseEntity<Long> {
 
     private String email;
     private String name;
@@ -41,36 +34,29 @@ public class FromEmail extends BaseEntity<Long> {
     private String replyToName;
 
     /**
-     * Creates an empty {@link FromEmail} entity.
+     * Creates an empty {@link AbstractFromEmail} entity.
      */
-    public FromEmail() {
+    public AbstractFromEmail() {
     }
 
     /**
-     * Creates {@link FromEmail} entity for the given id.
+     * Creates {@link AbstractFromEmail} entity for the given id.
      *
      * @param id The id
      */
-    public FromEmail(Long id) {
+    public AbstractFromEmail(Long id) {
         super(id);
     }
 
     /**
-     * Creates {@link FromEmail} entity for the given E-Mail address.
+     * Creates {@link AbstractFromEmail} entity for the given E-Mail address.
      *
      * @param email The E-Mail address
      */
-    public FromEmail(String email) {
+    public AbstractFromEmail(String email) {
         this.email = email;
     }
 
-    @Override
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "idGenerator")
-    public Long getId() {
-        return id();
-    }
-
     /**
      * Returns the E-Mail address.
      *
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/BaseEntity.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/BaseEntity.java
index 470d2c13..c11db8c3 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/BaseEntity.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/BaseEntity.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/ColumnTypes.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/ColumnTypes.java
index a9ecd8f2..1a74c0a1 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/ColumnTypes.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/ColumnTypes.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/Email.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/Email.java
index 2a34da74..5ee7ad81 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/Email.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/Email.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailAddress.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailAddress.java
deleted file mode 100644
index ad925cea..00000000
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailAddress.java
+++ /dev/null
@@ -1,141 +0,0 @@
-/*
- * Copyright 2018 - 2022 Blazebit.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.notify.email.model.jpa;
-
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.Id;
-import javax.validation.constraints.NotNull;
-
-/**
- * An entity for the state of E-Mail addresses.
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-@Entity
-public class EmailAddress extends BaseEntity<String> {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Whether the current email address is verified.
-     */
-    private Boolean verified = false;
-    /**
-     * Email addresses can be suppressed when emails to the address bounce or
-     * complaints are received.
-     */
-    private Boolean suppressed = false;
-
-    /**
-     * Creates an empty E-Mail address.
-     */
-    public EmailAddress() {
-    }
-
-    /**
-     * Creates an E-Mail address.
-     *
-     * @param email      The E-Mail address
-     * @param verified   Whether the E-Mail address is verified
-     * @param suppressed Whether the E-Mail address is suppressed
-     */
-    public EmailAddress(String email, Boolean verified, Boolean suppressed) {
-        super(email == null ? null : email.toLowerCase());
-        this.verified = verified;
-        this.suppressed = suppressed;
-    }
-
-    /**
-     * Create a verified E-Mail address.
-     *
-     * @param address The E-Mail address
-     * @return a verified E-Mail address
-     */
-    public static EmailAddress verified(String address) {
-        return new EmailAddress(address, true, false);
-    }
-
-    /**
-     * Create a unverified E-Mail address.
-     *
-     * @param address The E-Mail address
-     * @return a unverified E-Mail address
-     */
-    public static EmailAddress unverified(String address) {
-        return new EmailAddress(address, false, false);
-    }
-
-    @Id
-    @Email
-    @Override
-    @Column(name = "id", nullable = false, columnDefinition = ColumnTypes.MAIL_ADDRESS)
-    public String getId() {
-        return id();
-    }
-
-    @Override
-    public void setId(String id) {
-        if (id == null) {
-            super.setId(null);
-        } else {
-            super.setId(id.toLowerCase());
-        }
-    }
-
-    /**
-     * Returns whether the E-Mail address is verified.
-     *
-     * @return whether the E-Mail address is verified
-     */
-    @NotNull
-    @Column(nullable = false)
-    public Boolean getVerified() {
-        return verified;
-    }
-
-    /**
-     * Sets whether the E-Mail address is verified.
-     *
-     * @param verified Whether the E-Mail address is verified
-     */
-    public void setVerified(Boolean verified) {
-        this.verified = verified;
-    }
-
-    /**
-     * Returns whether the E-Mail address is suppressed.
-     *
-     * @return whether the E-Mail address is suppressed
-     */
-    @NotNull
-    @Column(nullable = false)
-    public Boolean getSuppressed() {
-        return suppressed;
-    }
-
-    /**
-     * Sets whether the E-Mail address is suppressed.
-     *
-     * @param suppressed Whether the E-Mail address is suppressed
-     */
-    public void setSuppressed(Boolean suppressed) {
-        this.suppressed = suppressed;
-    }
-
-
-}
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailEventHandler.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailEventHandler.java
index 088b0393..62deb239 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailEventHandler.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationConfigurationSource.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationConfigurationSource.java
index cf03e9bd..70c9dd9d 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationConfigurationSource.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationConfigurationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -45,15 +45,15 @@ public EmailNotificationConfigurationSource(AbstractEmailNotification<?> emailNo
 //        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_RESOURCE_BUNDLE_PROPERTY, null);
 
 //        properties.put(EmailNotificationMessageResolver.EMAIL_TEMPLATE_CONTEXT_PROPERTY, null);
-        properties.put(EmailNotificationMessageResolver.EMAIL_TEMPLATE_PROCESSOR_FACTORY_PROPERTY, emailNotification.getTemplateProcessorType());
+        properties.put(EmailNotificationMessageResolver.EMAIL_TEMPLATE_PROCESSOR_TYPE_PROPERTY, emailNotification.getTemplateProcessorType());
 
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_SUBJECT_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.SUBJECT_PARAMETER_NAME));
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_SUBJECT_TEMPLATE_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.SUBJECT_TEMPLATE_PARAMETER_NAME));
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_TEXT_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_TEXT_PARAMETER_NAME));
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_TEXT_TEMPLATE_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_TEXT_TEMPLATE_PARAMETER_NAME));
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_HTML_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_HTML_PARAMETER_NAME));
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_HTML_TEMPLATE_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_HTML_TEMPLATE_PARAMETER_NAME));
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_ATTACHMENT_PROCESSORS_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.ATTACHMENTS_PARAMETER_NAME));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_SUBJECT_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.SUBJECT_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_SUBJECT_TEMPLATE_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.SUBJECT_TEMPLATE_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_TEXT_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_TEXT_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_TEXT_TEMPLATE_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_TEXT_TEMPLATE_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_HTML_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_HTML_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_HTML_TEMPLATE_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_HTML_TEMPLATE_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_ATTACHMENT_TEMPLATES_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.ATTACHMENT_TEMPLATES_PARAMETER));
         this.properties = properties;
     }
 
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationDeliveryState.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationDeliveryState.java
index 735284b2..857ac673 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationDeliveryState.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationDeliveryState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationReviewState.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationReviewState.java
index ecb586d3..f544780e 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationReviewState.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotificationReviewState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailValidator.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailValidator.java
index 8a049f6a..714fd88d 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailValidator.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailValidator.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/package-info.java b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/package-info.java
index 801590ec..f82a4fe2 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/package-info.java
+++ b/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/jpa/src/main/resources/email-notification-entity-classes.xml b/email/model/jpa/src/main/resources/email-notification-entity-classes.xml
deleted file mode 100644
index 39538461..00000000
--- a/email/model/jpa/src/main/resources/email-notification-entity-classes.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<!--
-  Copyright 2018 - 2022 Blazebit.
-
-  Licensed under the Apache License, Version 2.0 (the "License");
-  you may not use this file except in compliance with the License.
-  You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-  Unless required by applicable law or agreed to in writing, software
-  distributed under the License is distributed on an "AS IS" BASIS,
-  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-  See the License for the specific language governing permissions and
-  limitations under the License.
-  -->
-<entity-mappings xmlns="http://xmlns.jcp.org/xml/ns/persistence/orm"
-                 xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-                 xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence/orm http://xmlns.jcp.org/xml/ns/persistence/orm_2_1.xsd"
-                 version="2.1">
-
-	<entity class="com.blazebit.notify.email.model.jpa.EmailNotification" />
-    <entity class="com.blazebit.notify.email.model.jpa.FromEmail" />
-
-</entity-mappings>
diff --git a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/AbstractEmailNotification.java b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/AbstractEmailNotification.java
index 39ec120b..be225ce2 100644
--- a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/AbstractEmailNotification.java
+++ b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/AbstractEmailNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,12 +25,11 @@
 import com.blazebit.notify.email.message.EmailNotificationRecipient;
 import com.blazebit.notify.memory.model.AbstractNotification;
 import com.blazebit.notify.template.api.TemplateProcessor;
-import com.blazebit.notify.template.api.TemplateProcessorKey;
-
 import java.time.Instant;
-import java.util.Collection;
+import java.util.ArrayList;
+import java.util.List;
 import java.util.Locale;
-import java.util.Map;
+import java.util.TimeZone;
 
 /**
  * An abstract class implementing the {@link Notification} interface for E-Mail notifications.
@@ -42,33 +41,47 @@
 public abstract class AbstractEmailNotification<ID> extends AbstractNotification<ID> implements ConfigurationSourceProvider {
 
     /**
-     * The parameter name for the template processor type {@link TemplateProcessorKey#getTemplateProcessorResultType()}.
+     * The parameter name for the template processor type {@link com.blazebit.notify.template.api.TemplateProcessorKey#getTemplateProcessorType()}.
      */
-    public static final String TEMPLATE_PROCESSOR_TYPE_PARAMETER_NAME = "templateProcessorType";
+    public static final String TEMPLATE_PROCESSOR_TYPE_PARAMETER = "templateProcessorType";
     /**
-     * The parameter name for the subject which can be a plain {@link String} or a {@link TemplateProcessor}.
+     * The parameter name for the subject which is a plain {@link String}.
+     * The value represents the literal subject.
      */
-    public static final String SUBJECT_PARAMETER_NAME = "subject";
+    public static final String SUBJECT_PARAMETER = "subject";
     /**
-     * The parameter name for the text body which can be a plain {@link String} or a {@link TemplateProcessor}.
+     * The parameter name for the subject template which is a plain {@link String}.
+     * The value refers to a template name.
      */
-    public static final String BODY_TEXT_PARAMETER_NAME = "text";
+    public static final String SUBJECT_TEMPLATE_PARAMETER = "subjectTemplate";
     /**
-     * The parameter name for the html body which can be a plain {@link String} or a {@link TemplateProcessor}.
+     * The parameter name for the text body which is a plain {@link String}.
+     * The value refers to the literal text body.
      */
-    public static final String BODY_HTML_PARAMETER_NAME = "html";
+    public static final String BODY_TEXT_PARAMETER = "text";
     /**
-     * The parameter name for the attachments represented by a {@link TemplateProcessor} producing a collection of {@link Attachment}.
+     * The parameter name for the text body template which is a plain {@link String}.
+     * The value refers to a template name.
      */
-    public static final String ATTACHMENTS_PARAMETER_NAME = "attachments";
-
+    public static final String BODY_TEXT_TEMPLATE_PARAMETER = "textTemplate";
+    /**
+     * The parameter name for the html body which is a plain {@link String}.
+     * The value refers to the literal html body.
+     */
+    public static final String BODY_HTML_PARAMETER = "html";
+    /**
+     * The parameter name for the html body template which is a plain {@link String}.
+     * The value refers to a template name.
+     */
+    public static final String BODY_HTML_TEMPLATE_PARAMETER = "htmlTemplate";
+    /**
+     * The parameter name for the attachments which is a collection of plain {@link String}s referring to
+     * template names. The templates are expected to be processed to a collection of
+     * {@link Attachment} by a {@link TemplateProcessor}.
+     */
+    public static final String ATTACHMENT_TEMPLATES_PARAMETER = "attachmentTemplates";
     private static final long serialVersionUID = 1L;
 
-    private static final TemplateProcessor<String> SUBJECT_TEMPLATE_PROCESSOR = new ModelGetOrDelegateTemplateProcessor<>(SUBJECT_PARAMETER_NAME);
-    private static final TemplateProcessor<String> BODY_TEXT_TEMPLATE_PROCESSOR = new ModelGetOrDelegateTemplateProcessor<>(BODY_TEXT_PARAMETER_NAME);
-    private static final TemplateProcessor<String> BODY_HTML_TEMPLATE_PROCESSOR = new ModelGetOrDelegateTemplateProcessor<>(BODY_HTML_PARAMETER_NAME);
-    private static final TemplateProcessor<Collection<Attachment>> ATTACHMENTS_TEMPLATE_PROCESSOR = new ModelGetOrDelegateTemplateProcessor<>(ATTACHMENTS_PARAMETER_NAME);
-
     private FromEmail from;
     private String to;
 
@@ -100,7 +113,7 @@ public void markDone(JobInstanceProcessingContext<?> jobProcessingContext, Objec
 
     @Override
     public NotificationRecipient getRecipient() {
-        return EmailNotificationRecipient.of(to, Locale.getDefault(), to);
+        return EmailNotificationRecipient.of(to, Locale.getDefault(), TimeZone.getDefault(), to);
     }
 
     @Override
@@ -109,93 +122,39 @@ public ConfigurationSource getConfigurationSource(NotificationJobContext context
     }
 
     /**
-     * Returns the template processor type to use for subject, text body and html body.
+     * Returns the template processor type to use for subject, text body. html body and attachments.
      *
      * @return the template processor type
      */
     public String getTemplateProcessorType() {
-        return (String) getJobConfiguration().getParameters().get(TEMPLATE_PROCESSOR_TYPE_PARAMETER_NAME);
+        return (String) getJobConfiguration().getParameters().get(TEMPLATE_PROCESSOR_TYPE_PARAMETER);
     }
 
     /**
-     * Sets that subject, text body and html body should be processed by a template processor with the given type.
+     * Sets that subject, text body, html body and attachments should be processed by a template processor with the given type.
      *
      * @param templateProcessorType The template processor type
      */
     public void setTemplateProcessorType(String templateProcessorType) {
-        getJobConfiguration().getParameters().put(TEMPLATE_PROCESSOR_TYPE_PARAMETER_NAME, templateProcessorType);
-    }
-
-    /**
-     * Returns the subject template processor.
-     *
-     * @return the subject template processor
-     */
-    public TemplateProcessor<String> getSubjectTemplateProcessor() {
-        return SUBJECT_TEMPLATE_PROCESSOR;
-    }
-
-    /**
-     * Sets the given subject template processor.
-     *
-     * @param subjectTemplateProcessor The template processor
-     */
-    public void setSubjectTemplateProcessor(TemplateProcessor<String> subjectTemplateProcessor) {
-        getJobConfiguration().getParameters().put(SUBJECT_PARAMETER_NAME, subjectTemplateProcessor);
-    }
-
-    /**
-     * Returns the text body template processor.
-     *
-     * @return the text body template processor
-     */
-    public TemplateProcessor<String> getBodyTextTemplateProcessor() {
-        return BODY_TEXT_TEMPLATE_PROCESSOR;
-    }
-
-    /**
-     * Sets the given text body template processor.
-     *
-     * @param bodyTextTemplateProcessor The template processor
-     */
-    public void setBodyTextTemplateProcessor(TemplateProcessor<String> bodyTextTemplateProcessor) {
-        getJobConfiguration().getParameters().put(BODY_TEXT_PARAMETER_NAME, bodyTextTemplateProcessor);
-    }
-
-    /**
-     * Returns the html body template processor.
-     *
-     * @return the html body template processor
-     */
-    public TemplateProcessor<String> getBodyHtmlTemplateProcessor() {
-        return BODY_HTML_TEMPLATE_PROCESSOR;
-    }
-
-    /**
-     * Sets the given html body template processor.
-     *
-     * @param bodyHtmlTemplateProcessor The template processor
-     */
-    public void setBodyHtmlTemplateProcessor(TemplateProcessor<String> bodyHtmlTemplateProcessor) {
-        getJobConfiguration().getParameters().put(BODY_HTML_PARAMETER_NAME, bodyHtmlTemplateProcessor);
+        getJobConfiguration().getParameters().put(TEMPLATE_PROCESSOR_TYPE_PARAMETER, templateProcessorType);
     }
 
     /**
-     * Returns the attachment template processor.
+     * Returns the subject template name.
      *
-     * @return the attachment template processor
+     * @return the subject template name
      */
-    public TemplateProcessor<Collection<Attachment>> getAttachmentProcessor() {
-        return ATTACHMENTS_TEMPLATE_PROCESSOR;
+    public String getSubjectTemplateName() {
+        return (String) getJobConfiguration().getParameters().get(SUBJECT_TEMPLATE_PARAMETER);
     }
 
     /**
-     * Sets the given attachment template processor.
+     * Sets the given subject template name.
      *
-     * @param attachmentsTemplateProcessor The template processor
+     * @param subjectTemplateName The subject template name
      */
-    public void setAttachmentsTemplateProcessor(TemplateProcessor<Collection<Attachment>> attachmentsTemplateProcessor) {
-        getJobConfiguration().getParameters().put(ATTACHMENTS_PARAMETER_NAME, attachmentsTemplateProcessor);
+    public void setSubjectTemplateName(String subjectTemplateName) {
+        getJobConfiguration().getParameters().put(SUBJECT_TEMPLATE_PARAMETER, subjectTemplateName);
     }
 
     /**
@@ -204,7 +163,7 @@ public void setAttachmentsTemplateProcessor(TemplateProcessor<Collection<Attachm
      * @return the subject string
      */
     public String getSubject() {
-        return ((TemplateProcessor<String>) getJobConfiguration().getParameters().get(SUBJECT_PARAMETER_NAME)).processTemplate(null);
+        return (String) getJobConfiguration().getParameters().get(SUBJECT_PARAMETER);
     }
 
     /**
@@ -213,97 +172,97 @@ public String getSubject() {
      * @param subject The subject
      */
     public void setSubject(String subject) {
-        getJobConfiguration().getParameters().put(SUBJECT_PARAMETER_NAME, TemplateProcessor.of(subject));
+        getJobConfiguration().getParameters().put(SUBJECT_PARAMETER, subject);
     }
 
     /**
-     * Returns the text body string.
+     * Returns the text body template name.
      *
-     * @return the text body string
+     * @return the text body template name
      */
-    public String getBodyText() {
-        return ((TemplateProcessor<String>) getJobConfiguration().getParameters().get(BODY_TEXT_PARAMETER_NAME)).processTemplate(null);
+    public String getBodyTextTemplateName() {
+        return (String) getJobConfiguration().getParameters().get(BODY_TEXT_TEMPLATE_PARAMETER);
     }
 
     /**
-     * Sets the given text body.
+     * Sets the given text body template name.
      *
-     * @param bodyText The text body
+     * @param bodyTextTemplateName The text body template name
      */
-    public void setBodyText(String bodyText) {
-        getJobConfiguration().getParameters().put(BODY_TEXT_PARAMETER_NAME, TemplateProcessor.of(bodyText));
+    public void setBodyTextTemplateName(String bodyTextTemplateName) {
+        getJobConfiguration().getParameters().put(BODY_TEXT_TEMPLATE_PARAMETER, bodyTextTemplateName);
     }
 
     /**
-     * Returns the html body string.
+     * Returns the body text string.
      *
-     * @return the html body string
+     * @return the body text string
      */
-    public String getBodyHtml() {
-        return ((TemplateProcessor<String>) getJobConfiguration().getParameters().get(BODY_HTML_PARAMETER_NAME)).processTemplate(null);
+    public String getBodyText() {
+        return (String) getJobConfiguration().getParameters().get(BODY_TEXT_PARAMETER);
     }
 
     /**
-     * Sets the given html body.
+     * Sets the given body text.
      *
-     * @param bodyHtml The html body
+     * @param bodyText The body text
      */
-    public void setBodyHtml(String bodyHtml) {
-        getJobConfiguration().getParameters().put(BODY_HTML_PARAMETER_NAME, TemplateProcessor.of(bodyHtml));
+    public void setBodyText(String bodyText) {
+        getJobConfiguration().getParameters().put(BODY_TEXT_PARAMETER, bodyText);
     }
 
     /**
-     * Returns the subject template name.
+     * Returns the html body template name.
      *
-     * @return the subject template name
+     * @return the html body template name
      */
-    public String getSubjectTemplateName() {
-        return (String) getJobConfiguration().getParameters().get(SUBJECT_PARAMETER_NAME);
+    public String getBodyHtmlTemplateName() {
+        return (String) getJobConfiguration().getParameters().get(BODY_HTML_TEMPLATE_PARAMETER);
     }
 
     /**
-     * Sets the given subject template name.
+     * Sets the given html body template name.
      *
-     * @param subjectTemplateName The subject template name
+     * @param bodyHtmlTemplateName The html body template name
      */
-    public void setSubjectTemplateName(String subjectTemplateName) {
-        getJobConfiguration().getParameters().put(SUBJECT_PARAMETER_NAME, subjectTemplateName);
+    public void setBodyHtmlTemplateName(String bodyHtmlTemplateName) {
+        getJobConfiguration().getParameters().put(BODY_HTML_TEMPLATE_PARAMETER, bodyHtmlTemplateName);
     }
 
     /**
-     * Returns the text body template name.
+     * Returns the body html string.
      *
-     * @return the text body template name
+     * @return the body html string
      */
-    public String getBodyTextTemplateName() {
-        return (String) getJobConfiguration().getParameters().get(BODY_TEXT_PARAMETER_NAME);
+    public String getBodyHtml() {
+        return (String) getJobConfiguration().getParameters().get(BODY_HTML_PARAMETER);
     }
 
     /**
-     * Sets the given text body template name.
+     * Sets the given body html.
      *
-     * @param bodyTextTemplateName The text body template name
+     * @param bodyHtml The body html
      */
-    public void setBodyTextTemplateName(String bodyTextTemplateName) {
-        getJobConfiguration().getParameters().put(BODY_TEXT_PARAMETER_NAME, bodyTextTemplateName);
+    public void setBodyHtml(String bodyHtml) {
+        getJobConfiguration().getParameters().put(BODY_HTML_PARAMETER, bodyHtml);
     }
 
     /**
-     * Returns the html body template name.
+     * Returns the attachment template names.
      *
-     * @return the html body template name
+     * @return the attachment template names
      */
-    public String getBodyHtmlTemplateName() {
-        return (String) getJobConfiguration().getParameters().get(BODY_HTML_PARAMETER_NAME);
+    public List<Attachment> getAttachmentTemplates() {
+        return (List<Attachment>) getJobConfiguration().getParameters().get(ATTACHMENT_TEMPLATES_PARAMETER);
     }
 
     /**
-     * Sets the given html body template name.
+     * Sets the attachment template names.
      *
-     * @param bodyHtmlTemplateName The html body template name
+     * @param attachmentTemplates The attachment template names
      */
-    public void setBodyHtmlTemplateName(String bodyHtmlTemplateName) {
-        getJobConfiguration().getParameters().put(BODY_HTML_PARAMETER_NAME, bodyHtmlTemplateName);
+    public void setAttachmentTemplates(List<String> attachmentTemplates) {
+        getJobConfiguration().getParameters().put(ATTACHMENT_TEMPLATES_PARAMETER, new ArrayList<>(attachmentTemplates));
     }
 
     /**
@@ -431,29 +390,4 @@ public EmailNotificationReviewState getReviewState() {
     public void setReviewState(EmailNotificationReviewState reviewState) {
         this.reviewState = reviewState;
     }
-
-    /**
-     * A template processor delegating to a parameter of the model map.
-     *
-     * @author Christian Beikov
-     * @since 1.0.0
-     */
-    private static class ModelGetOrDelegateTemplateProcessor<T> implements TemplateProcessor<T> {
-
-        private final String parameter;
-
-        public ModelGetOrDelegateTemplateProcessor(String parameter) {
-            this.parameter = parameter;
-        }
-
-        @Override
-        public T processTemplate(Map<String, Object> model) {
-            Object o = model.get(parameter);
-            if (o instanceof TemplateProcessor<?>) {
-                return ((TemplateProcessor<T>) o).processTemplate(model);
-            } else {
-                return (T) o;
-            }
-        }
-    }
 }
diff --git a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailAddress.java b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailAddress.java
deleted file mode 100644
index d97e8446..00000000
--- a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailAddress.java
+++ /dev/null
@@ -1,113 +0,0 @@
-/*
- * Copyright 2018 - 2022 Blazebit.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.notify.email.model.memory;
-
-/**
- * An model for the state of E-Mail addresses.
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class EmailAddress {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Whether the current email address is verified.
-     */
-    private Boolean verified = false;
-    /**
-     * Email addresses can be suppressed when emails to the address bounce or
-     * complaints are received.
-     */
-    private Boolean suppressed = false;
-
-    /**
-     * Creates an empty E-Mail address.
-     */
-    public EmailAddress() {
-    }
-
-    /**
-     * Creates an E-Mail address.
-     *
-     * @param email      The E-Mail address
-     * @param verified   Whether the E-Mail address is verified
-     * @param suppressed Whether the E-Mail address is suppressed
-     */
-    public EmailAddress(String email, Boolean verified, Boolean suppressed) {
-        this.verified = verified;
-        this.suppressed = suppressed;
-    }
-
-    /**
-     * Create a verified E-Mail address.
-     *
-     * @param address The E-Mail address
-     * @return a verified E-Mail address
-     */
-    public static EmailAddress verified(String address) {
-        return new EmailAddress(address, true, false);
-    }
-
-    /**
-     * Create a unverified E-Mail address.
-     *
-     * @param address The E-Mail address
-     * @return a unverified E-Mail address
-     */
-    public static EmailAddress unverified(String address) {
-        return new EmailAddress(address, false, false);
-    }
-
-    /**
-     * Returns whether the E-Mail address is verified.
-     *
-     * @return whether the E-Mail address is verified
-     */
-    public Boolean getVerified() {
-        return verified;
-    }
-
-    /**
-     * Sets whether the E-Mail address is verified.
-     *
-     * @param verified Whether the E-Mail address is verified
-     */
-    public void setVerified(Boolean verified) {
-        this.verified = verified;
-    }
-
-    /**
-     * Returns whether the E-Mail address is suppressed.
-     *
-     * @return whether the E-Mail address is suppressed
-     */
-    public Boolean getSuppressed() {
-        return suppressed;
-    }
-
-    /**
-     * Sets whether the E-Mail address is suppressed.
-     *
-     * @param suppressed Whether the E-Mail address is suppressed
-     */
-    public void setSuppressed(Boolean suppressed) {
-        this.suppressed = suppressed;
-    }
-
-
-}
diff --git a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailEventHandler.java b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailEventHandler.java
index 343e4c2f..dd8d28e5 100644
--- a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailEventHandler.java
+++ b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailEventHandler.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotification.java b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotification.java
deleted file mode 100644
index 1a7ffe1a..00000000
--- a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotification.java
+++ /dev/null
@@ -1,43 +0,0 @@
-/*
- * Copyright 2018 - 2022 Blazebit.
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *      http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package com.blazebit.notify.email.model.memory;
-
-import com.blazebit.notify.ConfigurationSourceProvider;
-
-/**
- * A simple E-Mail notification.
- *
- * @author Christian Beikov
- * @since 1.0.0
- */
-public class EmailNotification extends AbstractEmailNotification<Long> implements ConfigurationSourceProvider {
-
-    private static final long serialVersionUID = 1L;
-
-    /**
-     * Creates a E-Mail notification with the given id.
-     *
-     * @param id The notification id
-     */
-    public EmailNotification(Long id) {
-        super(id);
-    }
-
-    @Override
-    public Long getPartitionKey() {
-        return getId();
-    }
-}
diff --git a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationConfigurationSource.java b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationConfigurationSource.java
index 3d84bcc9..f541a417 100644
--- a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationConfigurationSource.java
+++ b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationConfigurationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -46,12 +46,15 @@ public EmailNotificationConfigurationSource(AbstractEmailNotification<?> emailNo
 //        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_RESOURCE_BUNDLE_PROPERTY, null);
 
 //        properties.put(EmailNotificationMessageResolver.EMAIL_TEMPLATE_CONTEXT_PROPERTY, null);
-        properties.put(EmailNotificationMessageResolver.EMAIL_TEMPLATE_PROCESSOR_FACTORY_PROPERTY, emailNotification.getTemplateProcessorType());
+        properties.put(EmailNotificationMessageResolver.EMAIL_TEMPLATE_PROCESSOR_TYPE_PROPERTY, emailNotification.getTemplateProcessorType());
 
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_SUBJECT_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.SUBJECT_PARAMETER_NAME));
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_TEXT_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_TEXT_PARAMETER_NAME));
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_HTML_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_HTML_PARAMETER_NAME));
-        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_ATTACHMENT_PROCESSORS_PROPERTY, emailNotification.getAttachmentProcessor());
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_SUBJECT_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.SUBJECT_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_SUBJECT_TEMPLATE_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.SUBJECT_TEMPLATE_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_TEXT_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_TEXT_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_TEXT_TEMPLATE_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_TEXT_TEMPLATE_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_HTML_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_HTML_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_HTML_TEMPLATE_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.BODY_HTML_TEMPLATE_PARAMETER));
+        properties.put(EmailNotificationMessageResolver.EMAIL_MESSAGE_ATTACHMENT_TEMPLATES_PROPERTY, emailNotification.getJobConfiguration().getParameters().get(AbstractEmailNotification.ATTACHMENT_TEMPLATES_PARAMETER));
         this.properties = properties;
     }
 
diff --git a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationDeliveryState.java b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationDeliveryState.java
index 46d8cb00..8d2efc72 100644
--- a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationDeliveryState.java
+++ b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationDeliveryState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationReviewState.java b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationReviewState.java
index 6d787102..7436e83c 100644
--- a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationReviewState.java
+++ b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/EmailNotificationReviewState.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/FromEmail.java b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/FromEmail.java
index 41a6da91..86791845 100644
--- a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/FromEmail.java
+++ b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/FromEmail.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/package-info.java b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/package-info.java
index 2418b1e8..d2fb6e68 100644
--- a/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/package-info.java
+++ b/email/model/memory/src/main/java/com/blazebit/notify/email/model/memory/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailBounceEvent.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailBounceEvent.java
index a72d7289..2ec0ae4c 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailBounceEvent.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailBounceEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailComplaintEvent.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailComplaintEvent.java
index 820009cb..8be6cefc 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailComplaintEvent.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailComplaintEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailDeliveryEvent.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailDeliveryEvent.java
index f176aa7f..3438e6f9 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailDeliveryEvent.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailDeliveryEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEvent.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEvent.java
index 9373ab9d..e72e0fa3 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEvent.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEvent.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceRecipient.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceRecipient.java
index 28ba6079..5d574ad1 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceRecipient.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceRecipient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceSubType.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceSubType.java
index 481c8883..80dd4748 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceSubType.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceSubType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceType.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceType.java
index dcb48899..6720ae8b 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceType.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventBounceType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventComplaintFeedbackType.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventComplaintFeedbackType.java
index 311cf397..6f4e1609 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventComplaintFeedbackType.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventComplaintFeedbackType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventNotificationType.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventNotificationType.java
index 4b4746e1..f3f0146f 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventNotificationType.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/EmailEventNotificationType.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/SnsSqsFeedbackConsumerListener.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/SnsSqsFeedbackConsumerListener.java
index 4d94de49..25ec27c2 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/SnsSqsFeedbackConsumerListener.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/SnsSqsFeedbackConsumerListener.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/package-info.java b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/package-info.java
index 9813deaf..1ef2b1f4 100644
--- a/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/package-info.java
+++ b/email/sns-sqs-feedback/src/main/java/com/blazebit/notify/email/sns/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractJobInstanceBasedNotification.java b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractJobInstanceBasedNotification.java
index 2501dffb..501fb721 100644
--- a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractJobInstanceBasedNotification.java
+++ b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractJobInstanceBasedNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotification.java b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotification.java
index 58cca3e5..c51a8810 100644
--- a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotification.java
+++ b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationId.java b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationId.java
index 7c76ec47..c176e276 100644
--- a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationId.java
+++ b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJob.java b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJob.java
index 88f44c99..3214d2b9 100644
--- a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJob.java
+++ b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJobInstance.java b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJobInstance.java
index 730242e8..ca68cb58 100644
--- a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJobInstance.java
+++ b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJobInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,6 @@
 import com.blazebit.job.jpa.model.AbstractJobInstance;
 import com.blazebit.notify.NotificationJobInstance;
 
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 import javax.persistence.Transient;
 
@@ -55,12 +52,6 @@ public AbstractNotificationJobInstance(Long id) {
         super(id);
     }
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "idGenerator")
-    public Long getId() {
-        return id();
-    }
-
     @Override
     @Transient
     public R getLastProcessed() {
diff --git a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJobTrigger.java b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJobTrigger.java
index fd79ca54..c08d04b7 100644
--- a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJobTrigger.java
+++ b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationJobTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationRecipient.java b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationRecipient.java
index 56cef2f3..280f3f81 100644
--- a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationRecipient.java
+++ b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractNotificationRecipient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,10 +19,8 @@
 import com.blazebit.job.jpa.model.BaseEntity;
 import com.blazebit.notify.NotificationRecipient;
 
+import java.util.TimeZone;
 import javax.persistence.Column;
-import javax.persistence.GeneratedValue;
-import javax.persistence.GenerationType;
-import javax.persistence.Id;
 import javax.persistence.MappedSuperclass;
 import java.util.Locale;
 
@@ -36,6 +34,7 @@
 public abstract class AbstractNotificationRecipient extends BaseEntity<Long> implements NotificationRecipient<Long> {
 
     private Locale locale;
+    private TimeZone timeZone;
 
     /**
      * Creates an empty notification recipient.
@@ -52,12 +51,6 @@ public AbstractNotificationRecipient(Long id) {
         super(id);
     }
 
-    @Id
-    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "idGenerator")
-    public Long getId() {
-        return id();
-    }
-
     @Override
     @Column(nullable = false)
     public Locale getLocale() {
@@ -72,4 +65,14 @@ public Locale getLocale() {
     public void setLocale(Locale locale) {
         this.locale = locale;
     }
+
+    @Override
+    @Column(nullable = false)
+    public TimeZone getTimeZone() {
+        return timeZone;
+    }
+
+    public void setTimeZone(TimeZone timeZone) {
+        this.timeZone = timeZone;
+    }
 }
diff --git a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractTriggerBasedNotificationJobInstance.java b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractTriggerBasedNotificationJobInstance.java
index 7ae2a922..b85698da 100644
--- a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractTriggerBasedNotificationJobInstance.java
+++ b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/AbstractTriggerBasedNotificationJobInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/package-info.java b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/package-info.java
index 50bafbc9..69976651 100644
--- a/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/package-info.java
+++ b/jpa/model/base/src/main/java/com/blazebit/notify/jpa/model/base/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/AbstractExpressionAwareNotificationJob.java b/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/AbstractExpressionAwareNotificationJob.java
index 384f2c07..66956d80 100644
--- a/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/AbstractExpressionAwareNotificationJob.java
+++ b/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/AbstractExpressionAwareNotificationJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/AbstractExpressionAwareNotificationJobInstance.java b/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/AbstractExpressionAwareNotificationJobInstance.java
index 02a72a9f..427151b1 100644
--- a/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/AbstractExpressionAwareNotificationJobInstance.java
+++ b/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/AbstractExpressionAwareNotificationJobInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/package-info.java b/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/package-info.java
index c9213ea1..584a5a5b 100644
--- a/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/package-info.java
+++ b/jpa/model/expression/src/main/java/com/blazebit/notify/jpa/model/expression/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/JpaNotificationPartitionKeyProvider.java b/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/JpaNotificationPartitionKeyProvider.java
index fe5e6350..84d2833a 100644
--- a/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/JpaNotificationPartitionKeyProvider.java
+++ b/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/JpaNotificationPartitionKeyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/JpaNotificationPartitionKeyProviderFactory.java b/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/JpaNotificationPartitionKeyProviderFactory.java
index 311d627d..985f565d 100644
--- a/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/JpaNotificationPartitionKeyProviderFactory.java
+++ b/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/JpaNotificationPartitionKeyProviderFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/package-info.java b/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/package-info.java
index 1706bad2..9e6d9621 100644
--- a/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/package-info.java
+++ b/jpa/storage/src/main/java/com/blazebit/notify/jpa/storage/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/license-header-definition.xml b/license-header-definition.xml
index 5997d798..784066a0 100644
--- a/license-header-definition.xml
+++ b/license-header-definition.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2018 - 2022 Blazebit.
+  Copyright 2018 - 2023 Blazebit.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractJobInstanceBasedNotification.java b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractJobInstanceBasedNotification.java
index b91db515..acb173a0 100644
--- a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractJobInstanceBasedNotification.java
+++ b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractJobInstanceBasedNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotification.java b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotification.java
index cb11e202..cd3f171d 100644
--- a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotification.java
+++ b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationId.java b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationId.java
index 0b207694..13859c2d 100644
--- a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationId.java
+++ b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJob.java b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJob.java
index 438622cf..43fa8111 100644
--- a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJob.java
+++ b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJobInstance.java b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJobInstance.java
index e7e032bd..58cfc62c 100644
--- a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJobInstance.java
+++ b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJobInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJobTrigger.java b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJobTrigger.java
index f594ba72..384d8c6e 100644
--- a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJobTrigger.java
+++ b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationJobTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationRecipient.java b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationRecipient.java
index 9c4843bc..b25ef04f 100644
--- a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationRecipient.java
+++ b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractNotificationRecipient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,6 +20,7 @@
 import com.blazebit.notify.NotificationRecipient;
 
 import java.util.Locale;
+import java.util.TimeZone;
 
 /**
  * An abstract base class implementing the {@link NotificationRecipient} interface.
@@ -27,9 +28,10 @@
  * @author Christian Beikov
  * @since 1.0.0
  */
-public class AbstractNotificationRecipient extends BaseEntity<Long> implements NotificationRecipient<Long> {
+public abstract class AbstractNotificationRecipient extends BaseEntity<Long> implements NotificationRecipient<Long> {
 
     private Locale locale;
+    private TimeZone timeZone;
 
     /**
      * Creates an empty notification recipient.
@@ -59,4 +61,13 @@ public Locale getLocale() {
     public void setLocale(Locale locale) {
         this.locale = locale;
     }
+
+    @Override
+    public TimeZone getTimeZone() {
+        return timeZone;
+    }
+
+    public void setTimeZone(TimeZone timeZone) {
+        this.timeZone = timeZone;
+    }
 }
diff --git a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractTriggerBasedNotificationJobInstance.java b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractTriggerBasedNotificationJobInstance.java
index 9062d146..bda71bd6 100644
--- a/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractTriggerBasedNotificationJobInstance.java
+++ b/memory/model/src/main/java/com/blazebit/notify/memory/model/AbstractTriggerBasedNotificationJobInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/memory/model/src/main/java/com/blazebit/notify/memory/model/package-info.java b/memory/model/src/main/java/com/blazebit/notify/memory/model/package-info.java
index df345858..c956ebef 100644
--- a/memory/model/src/main/java/com/blazebit/notify/memory/model/package-info.java
+++ b/memory/model/src/main/java/com/blazebit/notify/memory/model/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/memory/storage/src/main/java/com/blazebit/notify/memory/storage/MemoryNotificationPartitionKeyProvider.java b/memory/storage/src/main/java/com/blazebit/notify/memory/storage/MemoryNotificationPartitionKeyProvider.java
index c5db93fc..45e98508 100644
--- a/memory/storage/src/main/java/com/blazebit/notify/memory/storage/MemoryNotificationPartitionKeyProvider.java
+++ b/memory/storage/src/main/java/com/blazebit/notify/memory/storage/MemoryNotificationPartitionKeyProvider.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/memory/storage/src/main/java/com/blazebit/notify/memory/storage/package-info.java b/memory/storage/src/main/java/com/blazebit/notify/memory/storage/package-info.java
index f31ac5b2..85b49dca 100644
--- a/memory/storage/src/main/java/com/blazebit/notify/memory/storage/package-info.java
+++ b/memory/storage/src/main/java/com/blazebit/notify/memory/storage/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/processor/hibernate-insert-select/src/main/java/com/blazebit/notify/processor/hibernate/insertselect/AbstractInsertSelectNotificationJobInstanceProcessor.java b/processor/hibernate-insert-select/src/main/java/com/blazebit/notify/processor/hibernate/insertselect/AbstractInsertSelectNotificationJobInstanceProcessor.java
index f97157f6..fd0cb3e6 100644
--- a/processor/hibernate-insert-select/src/main/java/com/blazebit/notify/processor/hibernate/insertselect/AbstractInsertSelectNotificationJobInstanceProcessor.java
+++ b/processor/hibernate-insert-select/src/main/java/com/blazebit/notify/processor/hibernate/insertselect/AbstractInsertSelectNotificationJobInstanceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/processor/hibernate-insert-select/src/main/java/com/blazebit/notify/processor/hibernate/insertselect/package-info.java b/processor/hibernate-insert-select/src/main/java/com/blazebit/notify/processor/hibernate/insertselect/package-info.java
index 390cda0b..7f61901a 100644
--- a/processor/hibernate-insert-select/src/main/java/com/blazebit/notify/processor/hibernate/insertselect/package-info.java
+++ b/processor/hibernate-insert-select/src/main/java/com/blazebit/notify/processor/hibernate/insertselect/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/processor/memory/src/main/java/com/blazebit/notify/processor/memory/AbstractMemoryNotificationJobInstanceProcessor.java b/processor/memory/src/main/java/com/blazebit/notify/processor/memory/AbstractMemoryNotificationJobInstanceProcessor.java
index 60559c42..df58fd13 100644
--- a/processor/memory/src/main/java/com/blazebit/notify/processor/memory/AbstractMemoryNotificationJobInstanceProcessor.java
+++ b/processor/memory/src/main/java/com/blazebit/notify/processor/memory/AbstractMemoryNotificationJobInstanceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/processor/memory/src/main/java/com/blazebit/notify/processor/memory/package-info.java b/processor/memory/src/main/java/com/blazebit/notify/processor/memory/package-info.java
index 9a4984f3..4b435a0e 100644
--- a/processor/memory/src/main/java/com/blazebit/notify/processor/memory/package-info.java
+++ b/processor/memory/src/main/java/com/blazebit/notify/processor/memory/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/AbstractInterpretingExpressionNotificationRecipientResolver.java b/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/AbstractInterpretingExpressionNotificationRecipientResolver.java
index 471a540e..38217697 100644
--- a/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/AbstractInterpretingExpressionNotificationRecipientResolver.java
+++ b/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/AbstractInterpretingExpressionNotificationRecipientResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/AbstractPredicatingExpressionNotificationRecipientResolver.java b/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/AbstractPredicatingExpressionNotificationRecipientResolver.java
index 47dbce7a..4a72bc6b 100644
--- a/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/AbstractPredicatingExpressionNotificationRecipientResolver.java
+++ b/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/AbstractPredicatingExpressionNotificationRecipientResolver.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/package-info.java b/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/package-info.java
index 5f232470..f05dae8b 100644
--- a/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/package-info.java
+++ b/recipient-resolver/expression/src/main/java/com/blazebit/notify/recipient/resolver/expression/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/config/BlazeDomainProducer.java b/server/src/main/java/com/blazebit/notify/server/config/BlazeDomainProducer.java
index e00ca0b9..ec2b8c82 100644
--- a/server/src/main/java/com/blazebit/notify/server/config/BlazeDomainProducer.java
+++ b/server/src/main/java/com/blazebit/notify/server/config/BlazeDomainProducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/config/BlazePersistenceProducer.java b/server/src/main/java/com/blazebit/notify/server/config/BlazePersistenceProducer.java
index c62c3a6a..7c53fd53 100644
--- a/server/src/main/java/com/blazebit/notify/server/config/BlazePersistenceProducer.java
+++ b/server/src/main/java/com/blazebit/notify/server/config/BlazePersistenceProducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/config/EntityManagerProducer.java b/server/src/main/java/com/blazebit/notify/server/config/EntityManagerProducer.java
index 39a10c47..49c58e27 100644
--- a/server/src/main/java/com/blazebit/notify/server/config/EntityManagerProducer.java
+++ b/server/src/main/java/com/blazebit/notify/server/config/EntityManagerProducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/config/JobManagerProducer.java b/server/src/main/java/com/blazebit/notify/server/config/JobManagerProducer.java
index 30b98eab..d5dcb50c 100644
--- a/server/src/main/java/com/blazebit/notify/server/config/JobManagerProducer.java
+++ b/server/src/main/java/com/blazebit/notify/server/config/JobManagerProducer.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/config/RestApplication.java b/server/src/main/java/com/blazebit/notify/server/config/RestApplication.java
index d544d38f..96faaf23 100644
--- a/server/src/main/java/com/blazebit/notify/server/config/RestApplication.java
+++ b/server/src/main/java/com/blazebit/notify/server/config/RestApplication.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotification.java b/server/src/main/java/com/blazebit/notify/server/model/EmailNotification.java
similarity index 54%
rename from email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotification.java
rename to server/src/main/java/com/blazebit/notify/server/model/EmailNotification.java
index 103c042e..ae7f908b 100644
--- a/email/model/jpa/src/main/java/com/blazebit/notify/email/model/jpa/EmailNotification.java
+++ b/server/src/main/java/com/blazebit/notify/server/model/EmailNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -13,17 +13,28 @@
  * See the License for the specific language governing permissions and
  * limitations under the License.
  */
-package com.blazebit.notify.email.model.jpa;
+package com.blazebit.notify.server.model;
 
 import com.blazebit.notify.ConfigurationSourceProvider;
 
+import com.blazebit.notify.NotificationRecipient;
+import com.blazebit.notify.email.message.EmailNotificationRecipient;
+import com.blazebit.notify.email.model.jpa.AbstractEmailNotification;
+import com.blazebit.notify.email.model.jpa.ColumnTypes;
+import java.util.Locale;
+import java.util.TimeZone;
+import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.FetchType;
 import javax.persistence.GeneratedValue;
 import javax.persistence.GenerationType;
 import javax.persistence.Id;
+import javax.persistence.JoinColumn;
+import javax.persistence.ManyToOne;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 import javax.persistence.Transient;
+import javax.validation.constraints.NotNull;
 
 /**
  * A simple E-Mail notification.
@@ -38,6 +49,9 @@ public class EmailNotification extends AbstractEmailNotification<Long> implement
 
     private static final long serialVersionUID = 1L;
 
+    private String to;
+    private FromEmail from;
+
     /**
      * Creates an empty E-Mail notification.
      */
@@ -66,4 +80,42 @@ public Long getId() {
     public Long getPartitionKey() {
         return id();
     }
+
+    /**
+     * Returns the to E-Mail address.
+     *
+     * @return the to E-Mail address
+     */
+    @NotNull
+    @Column(name = "to_email", nullable = false, columnDefinition = ColumnTypes.MAIL_RECIPIENT)
+    public String getTo() {
+        return to;
+    }
+
+    /**
+     * Sets the to E-Mail address.
+     *
+     * @param to The to E-Mail address
+     */
+    public void setTo(String to) {
+        this.to = to;
+    }
+
+    @Override
+    @Transient
+    public NotificationRecipient getRecipient() {
+        return EmailNotificationRecipient.of(to, Locale.getDefault(), TimeZone.getDefault(), to);
+    }
+
+    @NotNull
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "from_email", nullable = false)
+    @Override
+    public FromEmail getFrom() {
+        return from;
+    }
+
+    public void setFrom(FromEmail from) {
+        this.from = from;
+    }
 }
diff --git a/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJob.java b/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJob.java
index 8e348ea1..0d33201b 100644
--- a/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJob.java
+++ b/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -19,6 +19,9 @@
 import com.blazebit.notify.jpa.model.expression.AbstractExpressionAwareNotificationJob;
 
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
 
 /**
@@ -28,4 +31,11 @@
 @Entity
 @SequenceGenerator(name = "idGenerator", sequenceName = "job_seq", allocationSize = 1)
 public class EmailNotificationJob extends AbstractExpressionAwareNotificationJob {
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "idGenerator")
+    @Override
+    public Long getId() {
+        return id();
+    }
 }
diff --git a/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJobInstance.java b/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJobInstance.java
index daab5300..42c4630a 100644
--- a/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJobInstance.java
+++ b/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJobInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJobTrigger.java b/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJobTrigger.java
index 6fd04c6b..8b4e8521 100644
--- a/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJobTrigger.java
+++ b/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationJobTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,10 @@
 package com.blazebit.notify.server.model;
 
 import com.blazebit.notify.jpa.model.base.AbstractNotificationJobTrigger;
-
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
 
 /**
@@ -35,4 +37,11 @@ public EmailNotificationJobTrigger() {
     public EmailNotificationJobTrigger(Long id) {
         super(id);
     }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "idGenerator")
+    @Override
+    public Long getId() {
+        return id();
+    }
 }
diff --git a/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationRecipient.java b/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationRecipient.java
index 2cde2d42..34d82e83 100644
--- a/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationRecipient.java
+++ b/server/src/main/java/com/blazebit/notify/server/model/EmailNotificationRecipient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,9 +20,11 @@
 import com.blazebit.domain.declarative.DomainAttribute;
 import com.blazebit.domain.declarative.DomainType;
 import com.blazebit.notify.jpa.model.base.AbstractNotificationRecipient;
-
 import javax.persistence.Column;
 import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
 import javax.persistence.SequenceGenerator;
 import javax.persistence.Table;
 
@@ -46,9 +48,11 @@ public EmailNotificationRecipient(Long id) {
     }
 
     @Override
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "idGenerator")
     @DomainAttribute(Integer.class)
     public Long getId() {
-        return super.getId();
+        return id();
     }
 
     @Override
diff --git a/server/src/main/java/com/blazebit/notify/server/model/FromEmail.java b/server/src/main/java/com/blazebit/notify/server/model/FromEmail.java
new file mode 100644
index 00000000..6f216d5f
--- /dev/null
+++ b/server/src/main/java/com/blazebit/notify/server/model/FromEmail.java
@@ -0,0 +1,61 @@
+/*
+ * Copyright 2018 - 2023 Blazebit.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+package com.blazebit.notify.server.model;
+
+import com.blazebit.notify.email.model.jpa.AbstractFromEmail;
+import javax.persistence.Entity;
+import javax.persistence.GeneratedValue;
+import javax.persistence.GenerationType;
+import javax.persistence.Id;
+import javax.persistence.SequenceGenerator;
+import javax.persistence.Table;
+
+@Entity
+@Table(name = "from_email")
+@SequenceGenerator(name = "idGenerator", sequenceName = "from_email_seq")
+public class FromEmail extends AbstractFromEmail {
+
+    /**
+     * Creates an empty {@link FromEmail} entity.
+     */
+    public FromEmail() {
+    }
+
+    /**
+     * Creates {@link FromEmail} entity for the given id.
+     *
+     * @param id The id
+     */
+    public FromEmail(Long id) {
+        super(id);
+    }
+
+    /**
+     * Creates {@link FromEmail} entity for the given E-Mail address.
+     *
+     * @param email The E-Mail address
+     */
+    public FromEmail(String email) {
+        super(email);
+    }
+
+    @Id
+    @GeneratedValue(strategy = GenerationType.SEQUENCE, generator = "idGenerator")
+    @Override
+    public Long getId() {
+        return id();
+    }
+}
diff --git a/server/src/main/java/com/blazebit/notify/server/model/JobBasedEmailNotification.java b/server/src/main/java/com/blazebit/notify/server/model/JobBasedEmailNotification.java
index 47637f8d..29cee322 100644
--- a/server/src/main/java/com/blazebit/notify/server/model/JobBasedEmailNotification.java
+++ b/server/src/main/java/com/blazebit/notify/server/model/JobBasedEmailNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -25,6 +25,7 @@
 import javax.persistence.JoinColumn;
 import javax.persistence.ManyToOne;
 import javax.persistence.Transient;
+import javax.validation.constraints.NotNull;
 
 /**
  * @author Christian Beikov
@@ -37,6 +38,7 @@ public class JobBasedEmailNotification extends AbstractEmailNotification<JobBase
     private EmailNotificationJobInstance notificationJobInstance;
     private Long recipientId;
     private Long notificationJobInstanceId;
+    private FromEmail from;
 
     public JobBasedEmailNotification() {
         super(new JobBasedEmailNotificationId());
@@ -106,4 +108,16 @@ public Long getNotificationJobInstanceId() {
     public void setNotificationJobInstanceId(Long notificationJobInstanceId) {
         this.notificationJobInstanceId = notificationJobInstanceId;
     }
+
+    @NotNull
+    @ManyToOne(fetch = FetchType.LAZY, optional = false)
+    @JoinColumn(name = "from_email", nullable = false)
+    @Override
+    public FromEmail getFrom() {
+        return from;
+    }
+
+    public void setFrom(FromEmail from) {
+        this.from = from;
+    }
 }
diff --git a/server/src/main/java/com/blazebit/notify/server/model/JobBasedEmailNotificationId.java b/server/src/main/java/com/blazebit/notify/server/model/JobBasedEmailNotificationId.java
index ef0ff26a..8ab7463f 100644
--- a/server/src/main/java/com/blazebit/notify/server/model/JobBasedEmailNotificationId.java
+++ b/server/src/main/java/com/blazebit/notify/server/model/JobBasedEmailNotificationId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/notification/EmailNotificationJobInstanceProcessor.java b/server/src/main/java/com/blazebit/notify/server/notification/EmailNotificationJobInstanceProcessor.java
index d3926f36..967908d4 100644
--- a/server/src/main/java/com/blazebit/notify/server/notification/EmailNotificationJobInstanceProcessor.java
+++ b/server/src/main/java/com/blazebit/notify/server/notification/EmailNotificationJobInstanceProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -20,13 +20,12 @@
 import com.blazebit.job.JobInstanceState;
 import com.blazebit.job.Schedule;
 import com.blazebit.notify.email.model.jpa.EmailNotificationReviewState;
-import com.blazebit.notify.email.model.jpa.FromEmail;
 import com.blazebit.notify.processor.hibernate.insertselect.AbstractInsertSelectNotificationJobInstanceProcessor;
 import com.blazebit.notify.server.model.EmailNotificationJobInstance;
 import com.blazebit.notify.server.model.EmailNotificationRecipient;
+import com.blazebit.notify.server.model.FromEmail;
 import com.blazebit.notify.server.model.JobBasedEmailNotification;
 import com.blazebit.persistence.InsertCriteriaBuilder;
-
 import java.time.Instant;
 import java.util.HashMap;
 import java.util.Map;
diff --git a/server/src/main/java/com/blazebit/notify/server/notification/EmailNotificationJobProcessor.java b/server/src/main/java/com/blazebit/notify/server/notification/EmailNotificationJobProcessor.java
index fbe1bc6e..ad5ba3d8 100644
--- a/server/src/main/java/com/blazebit/notify/server/notification/EmailNotificationJobProcessor.java
+++ b/server/src/main/java/com/blazebit/notify/server/notification/EmailNotificationJobProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/notification/NotificationJobInstanceProcessorFactoryImpl.java b/server/src/main/java/com/blazebit/notify/server/notification/NotificationJobInstanceProcessorFactoryImpl.java
index 48f35ffd..fd288376 100644
--- a/server/src/main/java/com/blazebit/notify/server/notification/NotificationJobInstanceProcessorFactoryImpl.java
+++ b/server/src/main/java/com/blazebit/notify/server/notification/NotificationJobInstanceProcessorFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/notification/NotificationJobProcessorFactoryImpl.java b/server/src/main/java/com/blazebit/notify/server/notification/NotificationJobProcessorFactoryImpl.java
index 6a9216c3..e0311c44 100644
--- a/server/src/main/java/com/blazebit/notify/server/notification/NotificationJobProcessorFactoryImpl.java
+++ b/server/src/main/java/com/blazebit/notify/server/notification/NotificationJobProcessorFactoryImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/notification/NotificationRecipientResolverImpl.java b/server/src/main/java/com/blazebit/notify/server/notification/NotificationRecipientResolverImpl.java
index 63628081..1b60906b 100644
--- a/server/src/main/java/com/blazebit/notify/server/notification/NotificationRecipientResolverImpl.java
+++ b/server/src/main/java/com/blazebit/notify/server/notification/NotificationRecipientResolverImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/rest/api/TestEndpoint.java b/server/src/main/java/com/blazebit/notify/server/rest/api/TestEndpoint.java
index 4a9a7782..2bc0c258 100644
--- a/server/src/main/java/com/blazebit/notify/server/rest/api/TestEndpoint.java
+++ b/server/src/main/java/com/blazebit/notify/server/rest/api/TestEndpoint.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/server/src/main/java/com/blazebit/notify/server/rest/impl/StartupBean.java b/server/src/main/java/com/blazebit/notify/server/rest/impl/StartupBean.java
index 9f8cafba..f11d3e37 100644
--- a/server/src/main/java/com/blazebit/notify/server/rest/impl/StartupBean.java
+++ b/server/src/main/java/com/blazebit/notify/server/rest/impl/StartupBean.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -17,8 +17,7 @@
 package com.blazebit.notify.server.rest.impl;
 
 import com.blazebit.notify.NotificationJobContext;
-import com.blazebit.notify.email.model.jpa.FromEmail;
-
+import com.blazebit.notify.server.model.FromEmail;
 import javax.annotation.PostConstruct;
 import javax.ejb.Singleton;
 import javax.ejb.Startup;
diff --git a/server/src/main/java/com/blazebit/notify/server/rest/impl/TestEndpointImpl.java b/server/src/main/java/com/blazebit/notify/server/rest/impl/TestEndpointImpl.java
index bf1efdfb..ccead404 100644
--- a/server/src/main/java/com/blazebit/notify/server/rest/impl/TestEndpointImpl.java
+++ b/server/src/main/java/com/blazebit/notify/server/rest/impl/TestEndpointImpl.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -18,19 +18,18 @@
 
 import com.blazebit.job.JobContext;
 import com.blazebit.notify.email.model.jpa.AbstractEmailNotification;
-import com.blazebit.notify.email.model.jpa.EmailNotification;
-import com.blazebit.notify.email.model.jpa.FromEmail;
+import com.blazebit.notify.server.model.EmailNotification;
 import com.blazebit.notify.server.model.EmailNotificationJob;
 import com.blazebit.notify.server.model.EmailNotificationJobTrigger;
 import com.blazebit.notify.server.model.EmailNotificationRecipient;
+import com.blazebit.notify.server.model.FromEmail;
 import com.blazebit.notify.server.rest.api.TestEndpoint;
-
+import java.time.Instant;
+import java.util.Locale;
 import javax.ejb.Stateless;
 import javax.inject.Inject;
 import javax.persistence.EntityManager;
 import javax.ws.rs.core.Response;
-import java.time.Instant;
-import java.util.Locale;
 
 /**
  * @author Christian Beikov
@@ -56,7 +55,6 @@ public Response test() {
         if (direct) {
             EmailNotification emailNotification = new EmailNotification();
             emailNotification.setTo(recipient.getEmail());
-            emailNotification.setTemplateProcessorType("freemarker");
             emailNotification.setChannelType("smtp");
             emailNotification.setFrom(entityManager.createQuery("SELECT e FROM FromEmail e", FromEmail.class).setMaxResults(1).getSingleResult());
             emailNotification.setSubject("Hello");
@@ -72,9 +70,9 @@ public Response test() {
             emailNotificationJobTrigger.setName("test");
             emailNotificationJobTrigger.setJob(emailJob);
             emailNotificationJobTrigger.setNotificationCronExpression("0 0 22 * * ?");
-            emailNotificationJobTrigger.getJobConfiguration().getParameters().put(AbstractEmailNotification.TEMPLATE_PROCESSOR_TYPE_PARAMETER_NAME, "freemarker");
-            emailNotificationJobTrigger.getJobConfiguration().getParameters().put(AbstractEmailNotification.SUBJECT_PARAMETER_NAME, "subject.ftl");
-            emailNotificationJobTrigger.getJobConfiguration().getParameters().put(AbstractEmailNotification.BODY_TEXT_PARAMETER_NAME, "text.ftl");
+            emailNotificationJobTrigger.getJobConfiguration().getParameters().put(AbstractEmailNotification.TEMPLATE_PROCESSOR_TYPE_PARAMETER, "freemarker");
+            emailNotificationJobTrigger.getJobConfiguration().getParameters().put(AbstractEmailNotification.SUBJECT_TEMPLATE_PARAMETER, "subject.ftl");
+            emailNotificationJobTrigger.getJobConfiguration().getParameters().put(AbstractEmailNotification.BODY_TEXT_TEMPLATE_PARAMETER, "text.ftl");
 //        emailNotificationJobTrigger.setScheduleCronExpression("0 * * * * ?");
             emailNotificationJobTrigger.setScheduleCronExpression(jobContext.getScheduleFactory().asCronExpression(Instant.now()));
             jobContext.getJobManager().addJobInstance(emailNotificationJobTrigger);
diff --git a/server/src/main/resources/META-INF/blaze-notify-server-entities.xml b/server/src/main/resources/META-INF/blaze-notify-server-entities.xml
index 79dbbaca..2a737a61 100644
--- a/server/src/main/resources/META-INF/blaze-notify-server-entities.xml
+++ b/server/src/main/resources/META-INF/blaze-notify-server-entities.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2018 - 2022 Blazebit.
+  Copyright 2018 - 2023 Blazebit.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -23,5 +23,7 @@
     <entity class="com.blazebit.notify.server.model.EmailNotificationJobInstance"/>
     <entity class="com.blazebit.notify.server.model.EmailNotificationJobTrigger"/>
     <entity class="com.blazebit.notify.server.model.EmailNotificationRecipient"/>
+    <entity class="com.blazebit.notify.server.model.FromEmail"/>
+    <entity class="com.blazebit.notify.server.model.EmailNotification"/>
 
 </entity-mappings>
diff --git a/server/src/main/resources/META-INF/persistence.xml b/server/src/main/resources/META-INF/persistence.xml
index 277a4be1..2dffb532 100644
--- a/server/src/main/resources/META-INF/persistence.xml
+++ b/server/src/main/resources/META-INF/persistence.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2018 - 2022 Blazebit.
+  Copyright 2018 - 2023 Blazebit.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
@@ -17,7 +17,6 @@
 <persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
     <persistence-unit name="NotifyPU" transaction-type="JTA">
 		<jta-data-source>java:jboss/datasources/NotifyDS</jta-data-source>
-		<mapping-file>email-notification-entity-classes.xml</mapping-file>
     	<mapping-file>META-INF/blaze-notify-server-entities.xml</mapping-file>
 
 		<exclude-unlisted-classes>true</exclude-unlisted-classes>
diff --git a/server/src/main/webapp/WEB-INF/beans.xml b/server/src/main/webapp/WEB-INF/beans.xml
index 7ac4e392..af74e646 100644
--- a/server/src/main/webapp/WEB-INF/beans.xml
+++ b/server/src/main/webapp/WEB-INF/beans.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0"?>
 <!--
-  Copyright 2018 - 2022 Blazebit.
+  Copyright 2018 - 2023 Blazebit.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/server/src/main/webapp/WEB-INF/jboss-web.xml b/server/src/main/webapp/WEB-INF/jboss-web.xml
index d1232ade..531244b5 100644
--- a/server/src/main/webapp/WEB-INF/jboss-web.xml
+++ b/server/src/main/webapp/WEB-INF/jboss-web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2018 - 2022 Blazebit.
+  Copyright 2018 - 2023 Blazebit.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/server/src/main/webapp/WEB-INF/web.xml b/server/src/main/webapp/WEB-INF/web.xml
index 84a6de48..418d2912 100644
--- a/server/src/main/webapp/WEB-INF/web.xml
+++ b/server/src/main/webapp/WEB-INF/web.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-  Copyright 2018 - 2022 Blazebit.
+  Copyright 2018 - 2023 Blazebit.
 
   Licensed under the Apache License, Version 2.0 (the "License");
   you may not use this file except in compliance with the License.
diff --git a/template/api/pom.xml b/template/api/pom.xml
index 896a2d81..d009abb8 100644
--- a/template/api/pom.xml
+++ b/template/api/pom.xml
@@ -10,4 +10,11 @@
 
     <artifactId>blaze-notify-template-api</artifactId>
 
+    <dependencies>
+        <dependency>
+            <groupId>com.blazebit</groupId>
+            <artifactId>blaze-job-core-api</artifactId>
+            <version>${version.blaze-job}</version>
+        </dependency>
+    </dependencies>
 </project>
\ No newline at end of file
diff --git a/template/api/src/main/java/com/blazebit/notify/template/api/ConfigurationSource.java b/template/api/src/main/java/com/blazebit/notify/template/api/ConfigurationSource.java
index 74fa59d6..c01cdcb3 100644
--- a/template/api/src/main/java/com/blazebit/notify/template/api/ConfigurationSource.java
+++ b/template/api/src/main/java/com/blazebit/notify/template/api/ConfigurationSource.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateContext.java b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateContext.java
index d1ebce15..7fe63119 100644
--- a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateContext.java
+++ b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateContext.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateException.java b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateException.java
index 3117095d..bd4fda2c 100644
--- a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateException.java
+++ b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateException.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessor.java b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessor.java
index 87179e0b..6d56df76 100644
--- a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessor.java
+++ b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -27,8 +27,6 @@
  */
 public interface TemplateProcessor<R> extends Serializable {
 
-    String TEMPLATE_NAME_PROPERTY = "template";
-
     /**
      * Processes this template based on the given map model.
      *
diff --git a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessorFactory.java b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessorFactory.java
index f0e719f8..2ae7c637 100644
--- a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessorFactory.java
+++ b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,6 +15,8 @@
  */
 package com.blazebit.notify.template.api;
 
+import com.blazebit.job.ServiceProvider;
+
 /**
  * A factory for template processors of a specific type.
  *
@@ -34,9 +36,11 @@ public interface TemplateProcessorFactory<R> {
     /**
      * Creates a new template processor for the given template context and configuration source.
      *
-     * @param templateContext     The template context
+     * @param templateContext The template context
+     * @param templateName The name of the template to retrieve a template processor for
      * @param configurationSource The configuration source
+     * @param serviceProvider The service provider of the job context
      * @return the template processor
      */
-    TemplateProcessor<R> createTemplateProcessor(TemplateContext templateContext, ConfigurationSource configurationSource);
+    TemplateProcessor<R> createTemplateProcessor(TemplateContext templateContext, String templateName, ConfigurationSource configurationSource, ServiceProvider serviceProvider);
 }
diff --git a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessorKey.java b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessorKey.java
index f5200e4c..3afe6d62 100644
--- a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessorKey.java
+++ b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateProcessorKey.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateResourceBundleLookup.java b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateResourceBundleLookup.java
index 4601f872..f6e9469a 100644
--- a/template/api/src/main/java/com/blazebit/notify/template/api/TemplateResourceBundleLookup.java
+++ b/template/api/src/main/java/com/blazebit/notify/template/api/TemplateResourceBundleLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/template/api/src/main/java/com/blazebit/notify/template/api/package-info.java b/template/api/src/main/java/com/blazebit/notify/template/api/package-info.java
index a3593f99..a830e41f 100644
--- a/template/api/src/main/java/com/blazebit/notify/template/api/package-info.java
+++ b/template/api/src/main/java/com/blazebit/notify/template/api/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateLookup.java b/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateLookup.java
index b20d1265..61f73822 100644
--- a/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateLookup.java
+++ b/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateLookup.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateProcessor.java b/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateProcessor.java
index c6fb7c78..da5d94d3 100644
--- a/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateProcessor.java
+++ b/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -47,24 +47,24 @@ public class FreemarkerTemplateProcessor implements TemplateProcessor<String>, S
     /**
      * The configuration property for the Freemarker {@link Configuration} object.
      */
-    public static final String FREEMARKER_CONFIGURATION_PROPERTY = "configuration";
+    public static final String FREEMARKER_CONFIGURATION_PROPERTY = "freemarker.configuration";
     /**
      * The configuration property for the Freemarker template encoding.
      */
-    public static final String FREEMARKER_ENCODING_PROPERTY = "encoding";
+    public static final String FREEMARKER_ENCODING_PROPERTY = "freemarker.encoding";
     /**
      * The configuration property for the Freemarker {@link Template}.
      */
-    public static final String FREEMARKER_TEMPLATE_PROPERTY = TEMPLATE_NAME_PROPERTY;
+    public static final String FREEMARKER_TEMPLATE_PROPERTY = "template";
 
     /**
      * The configuration property for the {@link ResourceBundle}.
      */
-    public static final String RESOURCE_BUNDLE_KEY = "resourceBundle";
+    public static final String RESOURCE_BUNDLE_MODEL_KEY = "resourceBundle";
     /**
      * The configuration property for the {@link Locale}.
      */
-    public static final String LOCALE_KEY = "locale";
+    public static final String LOCALE_MODEL_KEY = "locale";
 
     private final FreemarkerTemplateLookup freemarkerTemplateLookup;
 
@@ -73,12 +73,13 @@ public class FreemarkerTemplateProcessor implements TemplateProcessor<String>, S
     /**
      * Creates a new Freemarker template processor from the given configuration source.
      *
+     * @param templateName The template name
      * @param configurationSource The configuration source
      */
-    public FreemarkerTemplateProcessor(ConfigurationSource configurationSource) {
+    public FreemarkerTemplateProcessor(String templateName, ConfigurationSource configurationSource) {
         Function<String, FreemarkerTemplateLookup> templateAccessor = name -> (Locale locale) -> {
             Configuration configuration = configurationSource.getPropertyOrDefault(FREEMARKER_CONFIGURATION_PROPERTY, Configuration.class, null, o -> {
-                Configuration c = new Configuration();
+                Configuration c = new Configuration(Configuration.VERSION_2_3_28);
                 c.setClassLoaderForTemplateLoading(getClass().getClassLoader(), "");
                 return c;
             });
@@ -89,9 +90,9 @@ public FreemarkerTemplateProcessor(ConfigurationSource configurationSource) {
                 throw new TemplateException("", e);
             }
         };
-        this.freemarkerTemplateLookup = configurationSource.getPropertyOrFail(FREEMARKER_TEMPLATE_PROPERTY, FreemarkerTemplateLookup.class, templateAccessor);
+        this.freemarkerTemplateLookup = configurationSource.getPropertyOrDefault(FREEMARKER_TEMPLATE_PROPERTY, FreemarkerTemplateLookup.class, templateAccessor, o -> templateAccessor.apply(templateName));
         Function<String, TemplateResourceBundleLookup> resourceBundleAccessor = name -> (Locale locale) -> ResourceBundle.getBundle(name, locale);
-        this.resourceBundleLookup = configurationSource.getPropertyOrDefault(RESOURCE_BUNDLE_KEY, TemplateResourceBundleLookup.class, resourceBundleAccessor, o -> locale -> null);
+        this.resourceBundleLookup = configurationSource.getPropertyOrDefault(RESOURCE_BUNDLE_MODEL_KEY, TemplateResourceBundleLookup.class, resourceBundleAccessor, o -> locale -> null);
     }
 
     /**
@@ -118,10 +119,10 @@ public FreemarkerTemplateProcessor(FreemarkerTemplateLookup freemarkerTemplateLo
 
     @Override
     public String processTemplate(Map<String, Object> model) {
-        Locale locale = (Locale) model.get(LOCALE_KEY);
+        Locale locale = (Locale) model.get(LOCALE_MODEL_KEY);
         ResourceBundle resourceBundle = resourceBundleLookup.findResourceBundle(locale);
         if (resourceBundle == null) {
-            resourceBundle = (ResourceBundle) model.get(RESOURCE_BUNDLE_KEY);
+            resourceBundle = (ResourceBundle) model.get(RESOURCE_BUNDLE_MODEL_KEY);
         }
         if (resourceBundle != null) {
             model = new HashMap<>(model);
diff --git a/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateProcessorFactory.java b/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateProcessorFactory.java
index 84fb7d30..e3afe9b7 100644
--- a/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateProcessorFactory.java
+++ b/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/FreemarkerTemplateProcessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ public TemplateProcessorKey<String> getTemplateProcessorKey() {
     }
 
     @Override
-    public TemplateProcessor<String> createTemplateProcessor(TemplateContext templateContext, ConfigurationSource configurationSource) {
-        return new FreemarkerTemplateProcessor(configurationSource);
+    public TemplateProcessor<String> createTemplateProcessor(TemplateContext templateContext, String templateName, ConfigurationSource configurationSource, com.blazebit.job.ServiceProvider serviceProvider) {
+        return new FreemarkerTemplateProcessor(templateName, configurationSource);
     }
 }
diff --git a/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/package-info.java b/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/package-info.java
index 7f97ab5c..637dd7e3 100644
--- a/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/package-info.java
+++ b/template/freemarker/src/main/java/com/blazebit/notify/template/freemarker/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/ThymeleafTemplateProcessor.java b/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/ThymeleafTemplateProcessor.java
index 4265034f..183aff0d 100644
--- a/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/ThymeleafTemplateProcessor.java
+++ b/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/ThymeleafTemplateProcessor.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -15,14 +15,13 @@
  */
 package com.blazebit.template.thymeleaf;
 
-import com.blazebit.notify.template.api.ConfigurationSource;
+import com.blazebit.job.ServiceProvider;
 import com.blazebit.notify.template.api.TemplateException;
 import com.blazebit.notify.template.api.TemplateProcessor;
 import com.blazebit.notify.template.api.TemplateProcessorKey;
 import java.io.Serializable;
 import java.util.Locale;
 import java.util.Map;
-import java.util.function.Function;
 import org.thymeleaf.ITemplateEngine;
 import org.thymeleaf.TemplateEngine;
 import org.thymeleaf.context.Context;
@@ -38,8 +37,6 @@ public class ThymeleafTemplateProcessor implements TemplateProcessor<String>, Se
 
     public static final TemplateProcessorKey<String> KEY = TemplateProcessorKey.of("thymeleaf", String.class);
 
-    public static final String THYMELEAF_TEMPLATE_ENGINE_PROPERTY = "templateEngine";
-    public static final String THYMELEAF_TEMPLATE_NAME_PROPERTY = TEMPLATE_NAME_PROPERTY;
     public static final String LOCALE_MODEL_KEY = "locale";
 
     private final ITemplateEngine templateEngine;
@@ -48,11 +45,14 @@ public class ThymeleafTemplateProcessor implements TemplateProcessor<String>, Se
     /**
      * Creates a new Thymeleaf template processor from the given configuration source.
      *
-     * @param configurationSource The configuration source
+     * @param templateName The template name
+     * @param serviceProvider The service provider of the job context
+     *
      */
-    public ThymeleafTemplateProcessor(ConfigurationSource configurationSource) {
-        this.templateEngine = configurationSource.getPropertyOrDefault(THYMELEAF_TEMPLATE_ENGINE_PROPERTY, ITemplateEngine.class, val -> null, val -> new TemplateEngine());
-        this.templateName = configurationSource.getPropertyOrFail(THYMELEAF_TEMPLATE_NAME_PROPERTY, String.class, Function.identity());
+    public ThymeleafTemplateProcessor(String templateName, ServiceProvider serviceProvider) {
+        ITemplateEngine templateEngine = serviceProvider.getService(ITemplateEngine.class);
+        this.templateEngine = templateEngine == null ? new TemplateEngine() : templateEngine;
+        this.templateName = templateName;
     }
 
     @Override
diff --git a/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/ThymeleafTemplateProcessorFactory.java b/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/ThymeleafTemplateProcessorFactory.java
index c3a13077..41b2a93e 100644
--- a/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/ThymeleafTemplateProcessorFactory.java
+++ b/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/ThymeleafTemplateProcessorFactory.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,7 @@ public TemplateProcessorKey<String> getTemplateProcessorKey() {
     }
 
     @Override
-    public TemplateProcessor<String> createTemplateProcessor(TemplateContext templateContext, ConfigurationSource configurationSource) {
-        return new ThymeleafTemplateProcessor(configurationSource);
+    public TemplateProcessor<String> createTemplateProcessor(TemplateContext templateContext, String templateName, ConfigurationSource configurationSource, com.blazebit.job.ServiceProvider serviceProvider) {
+        return new ThymeleafTemplateProcessor(templateName, serviceProvider);
     }
 }
diff --git a/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/package-info.java b/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/package-info.java
index 76093148..67b3b7e7 100644
--- a/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/package-info.java
+++ b/template/thymeleaf/src/main/java/com/blazebit/template/thymeleaf/package-info.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testsuite/src/main/java/com/blazebit/notify/testsuite/OnceSchedule.java b/testsuite/src/main/java/com/blazebit/notify/testsuite/OnceSchedule.java
index 233fc165..0185dea8 100644
--- a/testsuite/src/main/java/com/blazebit/notify/testsuite/OnceSchedule.java
+++ b/testsuite/src/main/java/com/blazebit/notify/testsuite/OnceSchedule.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotification.java b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotification.java
index 58ea2e04..3c1eccfb 100644
--- a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotification.java
+++ b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotification.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationId.java b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationId.java
index 732dd094..7a267c6a 100644
--- a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationId.java
+++ b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationId.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJob.java b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJob.java
index aab4f0be..9c6c99ca 100644
--- a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJob.java
+++ b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJob.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJobInstance.java b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJobInstance.java
index 93b061e9..9d85ea5c 100644
--- a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJobInstance.java
+++ b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJobInstance.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJobTrigger.java b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJobTrigger.java
index 218bb297..f2bf9736 100644
--- a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJobTrigger.java
+++ b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationJobTrigger.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationMessage.java b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationMessage.java
index dbfd1cb2..63c081ff 100644
--- a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationMessage.java
+++ b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationMessage.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationRecipient.java b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationRecipient.java
index c522f609..75a72f31 100644
--- a/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationRecipient.java
+++ b/testsuite/src/main/java/com/blazebit/notify/testsuite/SimpleNotificationRecipient.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testsuite/src/test/java/com/blazebit/notify/testsuite/AbstractNotificationJobTest.java b/testsuite/src/test/java/com/blazebit/notify/testsuite/AbstractNotificationJobTest.java
index c079a77a..87ced411 100644
--- a/testsuite/src/test/java/com/blazebit/notify/testsuite/AbstractNotificationJobTest.java
+++ b/testsuite/src/test/java/com/blazebit/notify/testsuite/AbstractNotificationJobTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
diff --git a/testsuite/src/test/java/com/blazebit/notify/testsuite/NotificationJobProcessorTest.java b/testsuite/src/test/java/com/blazebit/notify/testsuite/NotificationJobProcessorTest.java
index a13a004a..ee282c66 100644
--- a/testsuite/src/test/java/com/blazebit/notify/testsuite/NotificationJobProcessorTest.java
+++ b/testsuite/src/test/java/com/blazebit/notify/testsuite/NotificationJobProcessorTest.java
@@ -1,5 +1,5 @@
 /*
- * Copyright 2018 - 2022 Blazebit.
+ * Copyright 2018 - 2023 Blazebit.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.