diff --git a/pom.xml b/pom.xml
index 4473e63..f0828c9 100644
--- a/pom.xml
+++ b/pom.xml
@@ -5,7 +5,7 @@
     <parent>
         <groupId>ch.sbb.polarion.extensions</groupId>
         <artifactId>ch.sbb.polarion.extension.generic</artifactId>
-        <version>6.7.0</version>
+        <version>7.0.0</version>
     </parent>
 
     <artifactId>ch.sbb.polarion.extension.pdf-exporter</artifactId>
@@ -59,6 +59,7 @@
 
         <maven-jar-plugin.Extension-Context>pdf-exporter</maven-jar-plugin.Extension-Context>
         <maven-jar-plugin.Automatic-Module-Name>ch.sbb.polarion.extension.pdf_exporter</maven-jar-plugin.Automatic-Module-Name>
+        <maven-jar-plugin.Discover-Base-Package>ch.sbb.polarion.extension.pdf.exporter</maven-jar-plugin.Discover-Base-Package>
         <web.app.name>${maven-jar-plugin.Extension-Context}</web.app.name>
 
         <!--suppress UnresolvedMavenProperty -->
@@ -109,11 +110,6 @@
             <artifactId>byte-buddy</artifactId>
             <version>${byte-buddy.version}</version>
         </dependency>
-        <dependency>
-            <groupId>com.google.re2j</groupId>
-            <artifactId>re2j</artifactId>
-            <version>${re2j.version}</version>
-        </dependency>
 
         <!--  Test dependencies  -->
         <dependency>
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterAdminUiServlet.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterAdminUiServlet.java
index 3c23f02..28f2ee8 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterAdminUiServlet.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterAdminUiServlet.java
@@ -1,8 +1,6 @@
 package ch.sbb.polarion.extension.pdf.exporter;
 
 import ch.sbb.polarion.extension.generic.GenericUiServlet;
-import ch.sbb.polarion.extension.generic.properties.CurrentExtensionConfiguration;
-import ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration;
 
 import java.io.Serial;
 
@@ -13,6 +11,5 @@ public class PdfExporterAdminUiServlet extends GenericUiServlet {
 
     public PdfExporterAdminUiServlet() {
         super("pdf-exporter-admin");
-        CurrentExtensionConfiguration.getInstance().setExtensionConfiguration(PdfExporterExtensionConfiguration.getInstance());
     }
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterFormExtension.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterFormExtension.java
index 71d61be..eae526e 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterFormExtension.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/PdfExporterFormExtension.java
@@ -155,7 +155,7 @@ private String adjustWebhooks(String scope, String form, StylePackageModel style
         Collection<SettingName> webhooksNames = getSettingNames(WebhooksSettings.FEATURE_NAME, scope);
         boolean noHooks = StringUtils.isEmpty(stylePackage.getWebhooks());
         String webhooksOptions = generateSelectOptions(webhooksNames, noHooks ? NamedSettings.DEFAULT_NAME : stylePackage.getWebhooks());
-        form = form.replace("{WEBHOOKS_DISPLAY}", PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled() ? "" : "hidden");
+        form = form.replace("{WEBHOOKS_DISPLAY}", PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled() ? "" : "hidden");
         form = form.replace("{WEBHOOKS_OPTIONS}", webhooksOptions);
         form = form.replace("{WEBHOOKS_SELECTOR_DISPLAY}", noHooks ? "none" : "inline-block");
         return form.replace("{WEBHOOKS_SELECTED}", noHooks ? "" : "checked");
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/HtmlToPdfConverter.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/HtmlToPdfConverter.java
index ee4d11d..8ada440 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/HtmlToPdfConverter.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/HtmlToPdfConverter.java
@@ -9,7 +9,7 @@
 import ch.sbb.polarion.extension.pdf.exporter.util.PdfExporterFileResourceProvider;
 import ch.sbb.polarion.extension.pdf.exporter.util.PdfTemplateProcessor;
 import ch.sbb.polarion.extension.pdf.exporter.util.html.HtmlLinksHelper;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import ch.sbb.polarion.extension.pdf.exporter.weasyprint.WeasyPrintOptions;
 import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.WeasyPrintServiceConnector;
 import lombok.Getter;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverter.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverter.java
index 587ca81..2eed861 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverter.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/converter/PdfConverter.java
@@ -154,7 +154,7 @@ public byte[] convertToPdf(@NotNull ExportParams exportParams, @Nullable ExportM
 
     private @NotNull String applyWebhooks(@NotNull ExportParams exportParams, @NotNull String htmlContent) {
         // Skip webhooks processing among other if this functionality is not enabled by system administrator
-        if (!PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled() || exportParams.getWebhooks() == null) {
+        if (!PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled() || exportParams.getWebhooks() == null) {
             return htmlContent;
         }
 
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/properties/PdfExporterExtensionConfiguration.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/properties/PdfExporterExtensionConfiguration.java
index 6efd98a..e0c3df8 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/properties/PdfExporterExtensionConfiguration.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/properties/PdfExporterExtensionConfiguration.java
@@ -1,12 +1,15 @@
 package ch.sbb.polarion.extension.pdf.exporter.properties;
 
+import ch.sbb.polarion.extension.generic.properties.CurrentExtensionConfiguration;
 import ch.sbb.polarion.extension.generic.properties.ExtensionConfiguration;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
 import com.polarion.core.config.impl.SystemValueReader;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.ArrayList;
 import java.util.List;
 
+@Discoverable
 public class PdfExporterExtensionConfiguration extends ExtensionConfiguration {
 
     public static final String WEASYPRINT_SERVICE = "weasyprint.service";
@@ -28,7 +31,7 @@ public Boolean getInternalizeExternalCss() {
     }
 
     @NotNull
-    public Boolean areWebhooksEnabled() {
+    public Boolean getWebhooksEnabled() {
         return SystemValueReader.getInstance().readBoolean(getPropertyPrefix() + WEBHOOKS_ENABLED, false);
     }
 
@@ -42,16 +45,7 @@ public Boolean areWebhooksEnabled() {
         return supportedProperties;
     }
 
-    public PdfExporterExtensionConfiguration() {
-        super();
-    }
-
     public static PdfExporterExtensionConfiguration getInstance() {
-        return PdfExporterExtensionConfigurationHolder.INSTANCE;
+        return (PdfExporterExtensionConfiguration) CurrentExtensionConfiguration.getInstance().getExtensionConfiguration();
     }
-
-    private static class PdfExporterExtensionConfigurationHolder {
-        private static final PdfExporterExtensionConfiguration INSTANCE = new PdfExporterExtensionConfiguration();
-    }
-
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationApiController.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationApiController.java
index 90b7478..5bc5078 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationApiController.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationApiController.java
@@ -1,8 +1,8 @@
 package ch.sbb.polarion.extension.pdf.exporter.rest.controller;
 
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
 import ch.sbb.polarion.extension.generic.rest.filter.Secured;
 import ch.sbb.polarion.extension.generic.service.PolarionService;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration.ConfigurationStatus;
 import org.jetbrains.annotations.NotNull;
 
 import javax.ws.rs.Path;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationInternalController.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationInternalController.java
index a3d8855..14d7d30 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationInternalController.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/ConfigurationInternalController.java
@@ -1,7 +1,13 @@
 package ch.sbb.polarion.extension.pdf.exporter.rest.controller;
 
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration.ConfigurationStatus;
-import ch.sbb.polarion.extension.pdf.exporter.util.configuration.ConfigurationStatusUtils;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.CORSStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.DefaultSettingsStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.DleToolbarStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.DocumentPropertiesPaneStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.LiveReportMainHeadStatusProvider;
+import ch.sbb.polarion.extension.pdf.exporter.util.configuration.WeasyPrintStatusProvider;
 import io.swagger.v3.oas.annotations.Hidden;
 import io.swagger.v3.oas.annotations.Operation;
 import org.jetbrains.annotations.NotNull;
@@ -23,7 +29,7 @@ public class ConfigurationInternalController {
     @Path("/configuration/default-settings")
     @Operation(summary = "Checks default settings configuration")
     public @NotNull ConfigurationStatus checkDefaultSettings(@QueryParam("scope") @DefaultValue("") String scope) {
-        return ConfigurationStatusUtils.getSettingsStatus(scope);
+        return new DefaultSettingsStatusProvider().getStatus(ConfigurationStatusProvider.Context.builder().scope(scope).build());
     }
 
     @GET
@@ -31,7 +37,7 @@ public class ConfigurationInternalController {
     @Path("/configuration/document-properties-pane-config")
     @Operation(summary = "Checks document properties pane configuration")
     public @NotNull ConfigurationStatus checkDocumentPropertiesPaneConfig(@QueryParam("scope") @DefaultValue("") String scope) {
-        return ConfigurationStatusUtils.getDocumentPropertiesPaneStatus(scope);
+        return new DocumentPropertiesPaneStatusProvider().getStatus(ConfigurationStatusProvider.Context.builder().scope(scope).build());
     }
 
     @GET
@@ -39,7 +45,7 @@ public class ConfigurationInternalController {
     @Path("/configuration/dle-toolbar-config")
     @Operation(summary = "Checks DLE Toolbar configuration")
     public @NotNull ConfigurationStatus checkDleToolbarConfig() {
-        return ConfigurationStatusUtils.getDleToolbarStatus();
+        return new DleToolbarStatusProvider().getStatus(ConfigurationStatusProvider.Context.builder().build());
     }
 
     @GET
@@ -47,7 +53,7 @@ public class ConfigurationInternalController {
     @Path("/configuration/live-report-config")
     @Operation(summary = "Checks Live Report configuration")
     public @NotNull ConfigurationStatus checkLiveReportConfig() {
-        return ConfigurationStatusUtils.getLiveReportMainHeadStatus();
+        return new LiveReportMainHeadStatusProvider().getStatus(ConfigurationStatusProvider.Context.builder().build());
     }
 
     @GET
@@ -55,7 +61,7 @@ public class ConfigurationInternalController {
     @Path("/configuration/cors-config")
     @Operation(summary = "Checks CORS configuration")
     public @NotNull ConfigurationStatus checkCORSConfig() {
-        return ConfigurationStatusUtils.getCORSStatus();
+        return new CORSStatusProvider().getStatus(ConfigurationStatusProvider.Context.builder().build());
     }
 
     @GET
@@ -63,6 +69,6 @@ public class ConfigurationInternalController {
     @Path("/configuration/weasyprint")
     @Operation(summary = "Checks WeasyPrint configuration")
     public @NotNull List<ConfigurationStatus> checkWeasyPrint() {
-        return ConfigurationStatusUtils.getWeasyPrintStatus();
+        return new WeasyPrintStatusProvider().getStatuses(ConfigurationStatusProvider.Context.builder().build());
     }
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/UtilityResourcesInternalController.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/UtilityResourcesInternalController.java
index 2d040d3..6bd622b 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/UtilityResourcesInternalController.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/controller/UtilityResourcesInternalController.java
@@ -90,6 +90,6 @@ public String getFileName(@QueryParam("locationPath") String locationPath, @Quer
     @Tag(name = "Utility resources")
     @Operation(summary = "Gets webhooks status - if they are enabled or not")
     public WebhooksStatus getWebhooksStatus() {
-        return WebhooksStatus.builder().enabled(PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled()).build();
+        return WebhooksStatus.builder().enabled(PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled()).build();
     }
 }
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/WorkItemRefData.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/WorkItemRefData.java
index 63bc247..ed869a6 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/WorkItemRefData.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/WorkItemRefData.java
@@ -1,6 +1,6 @@
 package ch.sbb.polarion.extension.pdf.exporter.rest.model;
 
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import com.fasterxml.jackson.annotation.JsonProperty;
 import lombok.AllArgsConstructor;
 import lombok.Data;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/ConfigurationStatus.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/ConfigurationStatus.java
deleted file mode 100644
index 2477099..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/ConfigurationStatus.java
+++ /dev/null
@@ -1,21 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration;
-
-import lombok.AllArgsConstructor;
-import lombok.Builder;
-import lombok.Data;
-import lombok.NoArgsConstructor;
-import org.jetbrains.annotations.NotNull;
-
-@Data
-@Builder
-@NoArgsConstructor
-@AllArgsConstructor
-public class ConfigurationStatus {
-    private @NotNull String name;
-    private @NotNull Status status;
-    private @NotNull String details;
-
-    public ConfigurationStatus(@NotNull String name, @NotNull Status status) {
-        this(name, status, "");
-    }
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/Status.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/Status.java
deleted file mode 100644
index b34d10d..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/rest/model/configuration/Status.java
+++ /dev/null
@@ -1,16 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration;
-
-public enum Status {
-    OK,
-    WARNING,
-    ERROR;
-
-    public String toHtml() {
-        String color = switch (this) {
-            case OK -> "green";
-            case WARNING -> "gray";
-            case ERROR -> "red";
-        };
-        return String.format("<span style='color: %s;'>%s</span>", color, this.name());
-    }
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/CoverPageSettings.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/CoverPageSettings.java
index 19b7415..5fb77d2 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/CoverPageSettings.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/settings/CoverPageSettings.java
@@ -7,7 +7,7 @@
 import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.coverpage.CoverPageModel;
 import ch.sbb.polarion.extension.pdf.exporter.service.PdfExporterPolarionService;
 import ch.sbb.polarion.extension.pdf.exporter.util.MediaUtils;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import com.polarion.core.util.logging.Logger;
 import com.polarion.platform.service.repository.IRepositoryReadOnlyConnection;
 import com.polarion.subterra.base.location.ILocation;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/HtmlProcessor.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/HtmlProcessor.java
index 5260783..04e8c02 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/HtmlProcessor.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/HtmlProcessor.java
@@ -10,8 +10,8 @@
 import ch.sbb.polarion.extension.pdf.exporter.settings.LocalizationSettings;
 import ch.sbb.polarion.extension.pdf.exporter.util.exporter.CustomPageBreakPart;
 import ch.sbb.polarion.extension.pdf.exporter.util.html.HtmlLinksHelper;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.IRegexEngine;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.IRegexEngine;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import com.polarion.alm.shared.util.StringUtils;
 import com.polarion.core.util.xml.CSSStyle;
 import lombok.SneakyThrows;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/LiveDocCommentsProcessor.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/LiveDocCommentsProcessor.java
index df2c76a..d9229bf 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/LiveDocCommentsProcessor.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/LiveDocCommentsProcessor.java
@@ -1,7 +1,7 @@
 package ch.sbb.polarion.extension.pdf.exporter.util;
 
 import ch.sbb.polarion.extension.pdf.exporter.model.LiveDocComment;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import com.polarion.alm.server.api.model.document.ProxyDocument;
 import com.polarion.alm.shared.api.model.comment.CommentBase;
 import com.polarion.alm.shared.api.model.comment.CommentBaseFields;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/CORSStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/CORSStatusProvider.java
new file mode 100644
index 0000000..f2dc328
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/CORSStatusProvider.java
@@ -0,0 +1,31 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.configuration.Status;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import com.polarion.core.config.Configuration;
+import org.jetbrains.annotations.NotNull;
+
+import java.util.Set;
+
+@Discoverable
+public class CORSStatusProvider extends ConfigurationStatusProvider {
+
+    public static final String CORS = "CORS (Cross-Origin Resource Sharing)";
+
+    @Override
+    public @NotNull ConfigurationStatus getStatus(@NotNull Context context) {
+        boolean restEnabled = Configuration.getInstance().rest().enabled();
+        if (restEnabled) {
+            Set<String> corsAllowedOrigins = Configuration.getInstance().rest().corsAllowedOrigins();
+            if (corsAllowedOrigins.isEmpty()) {
+                return new ConfigurationStatus(CORS, Status.WARNING, "CORS allowed origins are not configured");
+            } else {
+                return new ConfigurationStatus(CORS, Status.OK, "CORS allowed origins: %s".formatted(corsAllowedOrigins.stream().toList()));
+            }
+        } else {
+            return new ConfigurationStatus(CORS, Status.WARNING, "Polarion REST API is not enabled, so CORS is not enabled");
+        }
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/ConfigurationStatusUtils.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/ConfigurationStatusUtils.java
deleted file mode 100644
index 831dffd..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/ConfigurationStatusUtils.java
+++ /dev/null
@@ -1,135 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
-
-import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings;
-import ch.sbb.polarion.extension.generic.settings.NamedSettingsRegistry;
-import ch.sbb.polarion.extension.generic.settings.SettingsService;
-import ch.sbb.polarion.extension.generic.util.ScopeUtils;
-import ch.sbb.polarion.extension.pdf.exporter.converter.HtmlToPdfConverter;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration.ConfigurationStatus;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration.Status;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.conversion.Orientation;
-import ch.sbb.polarion.extension.pdf.exporter.rest.model.conversion.PaperSize;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
-import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.WeasyPrintServiceConnector;
-import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.model.WeasyPrintInfo;
-import com.polarion.core.config.Configuration;
-import com.polarion.subterra.base.location.ILocation;
-import lombok.experimental.UtilityClass;
-import org.jetbrains.annotations.NotNull;
-import org.jetbrains.annotations.Nullable;
-
-import java.util.List;
-import java.util.Set;
-
-@UtilityClass
-public class ConfigurationStatusUtils {
-    public static final String DEFAULT_SETTINGS = "Default Settings";
-    public static final String DOCUMENT_PROPERTIES_PANE = "Document Properties Pane";
-    public static final String DLE_TOOLBAR = "DLE Toolbar";
-    public static final String LIVE_REPORT_BUTTON = "LiveReport Button";
-    public static final String CORS = "CORS (Cross-Origin Resource Sharing)";
-    public static final List<String> WEASY_PRINT = List.of("WeasyPrint Python", "WeasyPrint", "WeasyPrint Service");
-
-    @SuppressWarnings("java:S1166") //need by design
-    public static @NotNull ConfigurationStatus getSettingsStatus(@NotNull String scope) {
-        ConfigurationStatus configurationStatus = new ConfigurationStatus(DEFAULT_SETTINGS, Status.OK, "");
-
-        NamedSettingsRegistry.INSTANCE.getAll().stream()
-                .map(GenericNamedSettings::getFeatureName)
-                .forEach(featureName -> {
-                    try {
-                        NamedSettingsRegistry.INSTANCE.getByFeatureName(featureName).readNames(scope);
-                    } catch (Exception e) {
-                        configurationStatus.setStatus(Status.ERROR);
-                        configurationStatus.setDetails(e.getMessage());
-                    }
-                });
-
-        return configurationStatus;
-    }
-
-    public static @NotNull ConfigurationStatus getDocumentPropertiesPaneStatus(@NotNull String scope) {
-        ILocation location = ScopeUtils.getContextLocation(scope).append(".polarion/documents/sidebar/document.xml");
-        String content = new SettingsService().read(location, null);
-
-        if (content == null) {
-            location = ScopeUtils.getDefaultLocation().append(".polarion/documents/sidebar/document.xml");
-            content = new SettingsService().read(location, null);
-            return getConfigurationStatus(DOCUMENT_PROPERTIES_PANE, content, "<extension id=\"pdf-exporter\".*/>", new ConfigurationStatus(DOCUMENT_PROPERTIES_PANE, Status.WARNING, "Not configured neither for global scope nor for current project"));
-        } else {
-            return getConfigurationStatus(DOCUMENT_PROPERTIES_PANE, content, "<extension id=\"pdf-exporter\".*/>", new ConfigurationStatus(DOCUMENT_PROPERTIES_PANE, Status.WARNING, "Not configured for current project"));
-        }
-    }
-
-
-    public static @NotNull ConfigurationStatus getDleToolbarStatus() {
-        final ILocation location = ScopeUtils.getDefaultLocation().append(".polarion/context.properties");
-        final String content = new SettingsService().read(location, null);
-
-        return getConfigurationStatus(DLE_TOOLBAR, content, "scriptInjection.dleEditorHead=<script src=\"/polarion/pdf-exporter/js/starter.js\"></script>.*<script>PdfExporterStarter.injectToolbar();</script>");
-    }
-
-    public static @NotNull ConfigurationStatus getLiveReportMainHeadStatus() {
-        final ILocation location = ScopeUtils.getDefaultLocation().append(".polarion/context.properties");
-        final String content = new SettingsService().read(location, null);
-
-        return getConfigurationStatus(LIVE_REPORT_BUTTON, content, "scriptInjection.mainHead=<script src=\"/polarion/pdf-exporter/js/starter.js\">");
-    }
-
-    @SuppressWarnings("java:S1166") //need by design
-    public static @NotNull List<ConfigurationStatus> getWeasyPrintStatus() {
-        try {
-            HtmlToPdfConverter htmlToPdfConverter = new HtmlToPdfConverter();
-            WeasyPrintServiceConnector weasyPrintServiceConnector = new WeasyPrintServiceConnector();
-
-            WeasyPrintInfo weasyPrintInfo = weasyPrintServiceConnector.getWeasyPrintInfo();
-            htmlToPdfConverter.convert("<html><body>test html</body></html>", Orientation.PORTRAIT, PaperSize.A4);
-
-            return List.of(
-                    createWeasyPrintStatus(WEASY_PRINT.get(0), weasyPrintInfo.getPython()),
-                    createWeasyPrintStatus(WEASY_PRINT.get(1), weasyPrintInfo.getWeasyprint()),
-                    createWeasyPrintStatus(WEASY_PRINT.get(2), weasyPrintInfo.getWeasyprintService())
-            );
-        } catch (Exception e) {
-            return List.of(new ConfigurationStatus(WEASY_PRINT.get(1), Status.ERROR, e.getMessage()));
-        }
-    }
-
-    private static @NotNull ConfigurationStatus createWeasyPrintStatus(@NotNull String name, @Nullable String description) {
-        if (description == null) {
-            return new ConfigurationStatus(name, Status.WARNING, "Unknown");
-        } else {
-            return new ConfigurationStatus(name, Status.OK, description);
-        }
-    }
-
-    public static @NotNull ConfigurationStatus getCORSStatus() {
-        boolean restEnabled = Configuration.getInstance().rest().enabled();
-        if (restEnabled) {
-            Set<String> corsAllowedOrigins = Configuration.getInstance().rest().corsAllowedOrigins();
-            if (corsAllowedOrigins.isEmpty()) {
-                return new ConfigurationStatus(CORS, Status.WARNING, "CORS allowed origins are not configured");
-            } else {
-                return new ConfigurationStatus(CORS, Status.OK, "CORS allowed origins: %s".formatted(corsAllowedOrigins.stream().toList()));
-            }
-        } else {
-            return new ConfigurationStatus(CORS, Status.WARNING, "Polarion REST API is not enabled, so CORS is not enabled");
-        }
-    }
-
-    private static @NotNull ConfigurationStatus getConfigurationStatus(@NotNull String name, @Nullable String content, @NotNull String regex) {
-        return getConfigurationStatus(name, content, regex, new ConfigurationStatus(name, Status.WARNING, "Not configured"));
-    }
-
-    private static @NotNull ConfigurationStatus getConfigurationStatus(@NotNull String name, @Nullable String content, @NotNull String regex, @NotNull ConfigurationStatus notOkStatus) {
-        if (content != null && contains(content, regex)) {
-            return new ConfigurationStatus(name, Status.OK);
-        } else {
-            return notOkStatus;
-        }
-    }
-
-    private static boolean contains(@NotNull String input, @NotNull String regex) {
-        return RegexMatcher.get(regex).anyMatch(input);
-    }
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DefaultSettingsStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DefaultSettingsStatusProvider.java
new file mode 100644
index 0000000..2f7a95a
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DefaultSettingsStatusProvider.java
@@ -0,0 +1,33 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.configuration.Status;
+import ch.sbb.polarion.extension.generic.settings.GenericNamedSettings;
+import ch.sbb.polarion.extension.generic.settings.NamedSettingsRegistry;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import org.jetbrains.annotations.NotNull;
+
+@Discoverable
+public class DefaultSettingsStatusProvider extends ConfigurationStatusProvider {
+
+    public static final String DEFAULT_SETTINGS = "Default Settings";
+
+    @Override
+    public @NotNull ConfigurationStatus getStatus(@NotNull Context context) {
+        ConfigurationStatus configurationStatus = new ConfigurationStatus(DEFAULT_SETTINGS, Status.OK, "");
+
+        NamedSettingsRegistry.INSTANCE.getAll().stream()
+                .map(GenericNamedSettings::getFeatureName)
+                .forEach(featureName -> {
+                    try {
+                        NamedSettingsRegistry.INSTANCE.getByFeatureName(featureName).readNames(context.getScope());
+                    } catch (Exception e) {
+                        configurationStatus.setStatus(Status.ERROR);
+                        configurationStatus.setDetails(e.getMessage());
+                    }
+                });
+
+        return configurationStatus;
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DleToolbarStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DleToolbarStatusProvider.java
new file mode 100644
index 0000000..61f5d70
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DleToolbarStatusProvider.java
@@ -0,0 +1,23 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.settings.SettingsService;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import ch.sbb.polarion.extension.generic.util.ScopeUtils;
+import com.polarion.subterra.base.location.ILocation;
+import org.jetbrains.annotations.NotNull;
+
+@Discoverable
+public class DleToolbarStatusProvider extends ConfigurationStatusProvider {
+
+    public static final String DLE_TOOLBAR = "DLE Toolbar";
+
+    @Override
+    public @NotNull ConfigurationStatus getStatus(@NotNull Context context) {
+        ILocation location = ScopeUtils.getDefaultLocation().append(".polarion/context.properties");
+        String content = new SettingsService().read(location, null);
+
+        return getConfigurationStatus(DLE_TOOLBAR, content, "scriptInjection.dleEditorHead=<script src=\"/polarion/pdf-exporter/js/starter.js\"></script>.*<script>PdfExporterStarter.injectToolbar();</script>");
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DocumentPropertiesPaneStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DocumentPropertiesPaneStatusProvider.java
new file mode 100644
index 0000000..e043269
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/DocumentPropertiesPaneStatusProvider.java
@@ -0,0 +1,30 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.configuration.Status;
+import ch.sbb.polarion.extension.generic.settings.SettingsService;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import ch.sbb.polarion.extension.generic.util.ScopeUtils;
+import com.polarion.subterra.base.location.ILocation;
+import org.jetbrains.annotations.NotNull;
+
+@Discoverable
+public class DocumentPropertiesPaneStatusProvider extends ConfigurationStatusProvider {
+
+    public static final String DOCUMENT_PROPERTIES_PANE = "Document Properties Pane";
+
+    @Override
+    public @NotNull ConfigurationStatus getStatus(@NotNull Context context) {
+        ILocation location = ScopeUtils.getContextLocation(context.getScope()).append(".polarion/documents/sidebar/document.xml");
+        String content = new SettingsService().read(location, null);
+
+        if (content == null) {
+            location = ScopeUtils.getDefaultLocation().append(".polarion/documents/sidebar/document.xml");
+            content = new SettingsService().read(location, null);
+            return getConfigurationStatus(DOCUMENT_PROPERTIES_PANE, content, "<extension id=\"pdf-exporter\".*/>", new ConfigurationStatus(DOCUMENT_PROPERTIES_PANE, Status.WARNING, "Not configured neither for global scope nor for current project"));
+        } else {
+            return getConfigurationStatus(DOCUMENT_PROPERTIES_PANE, content, "<extension id=\"pdf-exporter\".*/>", new ConfigurationStatus(DOCUMENT_PROPERTIES_PANE, Status.WARNING, "Not configured for current project"));
+        }
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/LiveReportMainHeadStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/LiveReportMainHeadStatusProvider.java
new file mode 100644
index 0000000..82978f5
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/LiveReportMainHeadStatusProvider.java
@@ -0,0 +1,23 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.settings.SettingsService;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import ch.sbb.polarion.extension.generic.util.ScopeUtils;
+import com.polarion.subterra.base.location.ILocation;
+import org.jetbrains.annotations.NotNull;
+
+@Discoverable
+public class LiveReportMainHeadStatusProvider extends ConfigurationStatusProvider {
+
+    public static final String LIVE_REPORT_BUTTON = "LiveReport Button";
+
+    @Override
+    public @NotNull ConfigurationStatus getStatus(@NotNull Context context) {
+        ILocation location = ScopeUtils.getDefaultLocation().append(".polarion/context.properties");
+        String content = new SettingsService().read(location, null);
+
+        return getConfigurationStatus(LIVE_REPORT_BUTTON, content, "scriptInjection.mainHead=<script src=\"/polarion/pdf-exporter/js/starter.js\">");
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/WeasyPrintStatusProvider.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/WeasyPrintStatusProvider.java
new file mode 100644
index 0000000..739b868
--- /dev/null
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/configuration/WeasyPrintStatusProvider.java
@@ -0,0 +1,48 @@
+package ch.sbb.polarion.extension.pdf.exporter.util.configuration;
+
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatus;
+import ch.sbb.polarion.extension.generic.configuration.ConfigurationStatusProvider;
+import ch.sbb.polarion.extension.generic.configuration.Status;
+import ch.sbb.polarion.extension.generic.util.Discoverable;
+import ch.sbb.polarion.extension.pdf.exporter.converter.HtmlToPdfConverter;
+import ch.sbb.polarion.extension.pdf.exporter.rest.model.conversion.Orientation;
+import ch.sbb.polarion.extension.pdf.exporter.rest.model.conversion.PaperSize;
+import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.WeasyPrintServiceConnector;
+import ch.sbb.polarion.extension.pdf.exporter.weasyprint.service.model.WeasyPrintInfo;
+import org.jetbrains.annotations.NotNull;
+import org.jetbrains.annotations.Nullable;
+
+import java.util.List;
+
+@Discoverable
+public class WeasyPrintStatusProvider extends ConfigurationStatusProvider {
+
+    public static final List<String> WEASY_PRINT = List.of("WeasyPrint Python", "WeasyPrint", "WeasyPrint Service");
+
+    private static @NotNull ConfigurationStatus createWeasyPrintStatus(@NotNull String name, @Nullable String description) {
+        if (description == null) {
+            return new ConfigurationStatus(name, Status.WARNING, "Unknown");
+        } else {
+            return new ConfigurationStatus(name, Status.OK, description);
+        }
+    }
+
+    @Override
+    public @NotNull List<ConfigurationStatus> getStatuses(@NotNull Context context) {
+        try {
+            HtmlToPdfConverter htmlToPdfConverter = new HtmlToPdfConverter();
+            WeasyPrintServiceConnector weasyPrintServiceConnector = new WeasyPrintServiceConnector();
+
+            WeasyPrintInfo weasyPrintInfo = weasyPrintServiceConnector.getWeasyPrintInfo();
+            htmlToPdfConverter.convert("<html><body>test html</body></html>", Orientation.PORTRAIT, PaperSize.A4);
+
+            return List.of(
+                    createWeasyPrintStatus(WEASY_PRINT.get(0), weasyPrintInfo.getPython()),
+                    createWeasyPrintStatus(WEASY_PRINT.get(1), weasyPrintInfo.getWeasyprint()),
+                    createWeasyPrintStatus(WEASY_PRINT.get(2), weasyPrintInfo.getWeasyprintService())
+            );
+        } catch (Exception e) {
+            return List.of(new ConfigurationStatus(WEASY_PRINT.get(1), Status.ERROR, e.getMessage()));
+        }
+    }
+}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/html/HtmlLinksHelper.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/html/HtmlLinksHelper.java
index 756aab0..d6dbd6d 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/html/HtmlLinksHelper.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/html/HtmlLinksHelper.java
@@ -2,7 +2,7 @@
 
 import ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration;
 import ch.sbb.polarion.extension.pdf.exporter.util.FileResourceProvider;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 
 import java.util.LinkedHashMap;
 import java.util.Map;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/placeholder/PlaceholderProcessor.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/placeholder/PlaceholderProcessor.java
index a55d3c1..bd2d713 100644
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/placeholder/PlaceholderProcessor.java
+++ b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/placeholder/PlaceholderProcessor.java
@@ -4,7 +4,7 @@
 import ch.sbb.polarion.extension.pdf.exporter.rest.model.settings.headerfooter.Placeholder;
 import ch.sbb.polarion.extension.pdf.exporter.service.PdfExporterPolarionService;
 import ch.sbb.polarion.extension.pdf.exporter.util.LiveDocHelper;
-import ch.sbb.polarion.extension.pdf.exporter.util.regex.RegexMatcher;
+import ch.sbb.polarion.extension.generic.regex.RegexMatcher;
 import org.jetbrains.annotations.NotNull;
 
 import java.util.HashSet;
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/IRegexEngine.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/IRegexEngine.java
deleted file mode 100644
index 1dd125b..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/IRegexEngine.java
+++ /dev/null
@@ -1,25 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.regex;
-
-import java.util.Map;
-
-public interface IRegexEngine {
-
-    Map<String, Class<? extends IRegexEngine>> IMPLEMENTATIONS = Map.of(
-            RegexEngineJavaUtilImpl.NAME, RegexEngineJavaUtilImpl.class,
-            RegexEngineRE2JImpl.NAME, RegexEngineRE2JImpl.class
-    );
-
-    boolean find();
-
-    String group();
-
-    String group(int group);
-
-    String group(String name);
-
-    void appendReplacement(StringBuilder sb, String replacement);
-
-    void appendTail(StringBuilder sb);
-
-    String quoteReplacement(String input);
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineJavaUtilImpl.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineJavaUtilImpl.java
deleted file mode 100644
index 3337f1a..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineJavaUtilImpl.java
+++ /dev/null
@@ -1,52 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.regex;
-
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
-
-/**
- * {@link IRegexEngine} implementation based on standard Java regex engine.
- */
-public class RegexEngineJavaUtilImpl implements IRegexEngine {
-
-    public static final String NAME = "java.util.regex";
-    private final Matcher matcher;
-
-    public RegexEngineJavaUtilImpl(String regex, int flags, String input) {
-        matcher = Pattern.compile(regex, flags).matcher(input);
-    }
-
-    @Override
-    public boolean find() {
-        return matcher.find();
-    }
-
-    @Override
-    public String group() {
-        return matcher.group();
-    }
-
-    @Override
-    public String group(int group) {
-        return matcher.group(group);
-    }
-
-    @Override
-    public String group(String name) {
-        return matcher.group(name);
-    }
-
-    @Override
-    public void appendReplacement(StringBuilder sb, String replacement) {
-        matcher.appendReplacement(sb, replacement);
-    }
-
-    @Override
-    public void appendTail(StringBuilder sb) {
-        matcher.appendTail(sb);
-    }
-
-    @Override
-    public String quoteReplacement(String input) {
-        return Matcher.quoteReplacement(input);
-    }
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineRE2JImpl.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineRE2JImpl.java
deleted file mode 100644
index b1b9342..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexEngineRE2JImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.regex;
-
-import com.google.re2j.Matcher;
-import com.google.re2j.Pattern;
-
-/**
- * {@link IRegexEngine} implementation based on RE2J.
- * RE2J is a regular expression engine that runs in time linear in the size of the input. RE2J is a port
- * of C++ library RE2 to pure Java.
- * Java's standard regular expression package, java.util.regex, and many other widely used regular expression
- * packages such as PCRE, Perl and Python use a backtracking implementation strategy: when a pattern presents two
- * alternatives such as a|b, the engine will try to match subpattern a first, and if that yields no match,
- * it will reset the input stream and try to match b instead.
- */
-public class RegexEngineRE2JImpl implements IRegexEngine {
-
-    public static final String NAME = "re2j";
-    private final Matcher matcher;
-
-    public RegexEngineRE2JImpl(String regex, int flags, String input) {
-
-        // RE2J uses slightly different syntax for named groups
-        regex = regex.replace("(?<", "(?P<");
-
-        matcher = Pattern.compile(regex, flags).matcher(input);
-    }
-
-    @Override
-    public boolean find() {
-        return matcher.find();
-    }
-
-    @Override
-    public String group() {
-        return matcher.group();
-    }
-
-    @Override
-    public String group(int group) {
-        return matcher.group(group);
-    }
-
-    @Override
-    public String group(String name) {
-        return matcher.group(name);
-    }
-
-    @Override
-    public void appendReplacement(StringBuilder sb, String replacement) {
-        matcher.appendReplacement(sb, replacement);
-    }
-
-    @Override
-    public void appendTail(StringBuilder sb) {
-        matcher.appendTail(sb);
-    }
-
-    @Override
-    public String quoteReplacement(String input) {
-        return Matcher.quoteReplacement(input);
-    }
-}
diff --git a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcher.java b/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcher.java
deleted file mode 100644
index d47aea7..0000000
--- a/src/main/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcher.java
+++ /dev/null
@@ -1,117 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.regex;
-
-import lombok.SneakyThrows;
-
-import java.util.Optional;
-import java.util.function.Function;
-import java.util.regex.Pattern;
-
-/**
- * Provides simplified way for string replacements/operations using regex.
- * Also allows to easily switch underlined regex engine: by default it uses RE2J implementation which is a preferable way because
- * in theory it works faster and guarantees linear time execution, but user can switch implementation to the java.util.regex-based
- * in case if there is need to use some features which is unsupported by RE2J - e.g. <code>(?=</code>, <code>(?></code> etc.,
- * full list of (un)supported features may be found <a href="https://github.com/google/re2/wiki/Syntax">here</a>).
- */
-@SuppressWarnings("unused")
-public class RegexMatcher {
-
-    public static final int CASE_INSENSITIVE = 1;
-    public static final int DOTALL = 2;
-
-    private final String regex;
-    private final int flags;
-    private String impl = RegexEngineRE2JImpl.NAME;
-
-    private RegexMatcher(String regex, int flags) {
-        this.regex = regex;
-        this.flags = flags;
-    }
-
-    public static RegexMatcher get(String regex) {
-        return get(regex, 0);
-    }
-
-    public static RegexMatcher get(String regex, int flags) {
-        return new RegexMatcher(regex, flags);
-    }
-
-    public static String quote(String s) {
-        return Pattern.quote(s);
-    }
-
-    /**
-     * Forces to use java.util.regex-based engine.
-     * NOTE: this isn't a preferable way, please consider rewriting regex to not use
-     * unsupported syntax and switch back to RE2J implementation.
-     */
-    public RegexMatcher useJavaUtil() {
-        this.impl = RegexEngineJavaUtilImpl.NAME;
-        return this;
-    }
-
-    public String replace(String input, IReplacementCalculator replacementCalculator) {
-        return replace(input, true, replacementCalculator);
-    }
-
-    public String replace(String input, boolean quoteReplacement, IReplacementCalculator replacementCalculator) {
-        IRegexEngine regexEngine = createEngine(input);
-        StringBuilder resultBuilder = new StringBuilder();
-        while (regexEngine.find()) {
-            String replacement = replacementCalculator.calculateReplacement(regexEngine);
-            if (replacement != null) {
-                regexEngine.appendReplacement(resultBuilder, quoteReplacement ? regexEngine.quoteReplacement(replacement) : replacement);
-            }
-        }
-        regexEngine.appendTail(resultBuilder);
-        return resultBuilder.toString();
-    }
-
-    public String replaceAll(String input, String replacementString) {
-        return replace(input, regexEngine -> replacementString);
-    }
-
-    public void processEntry(String input, IEntryProcessor entryProcessor) {
-        IRegexEngine regexEngine = createEngine(input);
-        while (regexEngine.find()) {
-            entryProcessor.processEntry(regexEngine);
-        }
-    }
-
-    public Optional<String> findFirst(String input) {
-        return findFirst(input, IRegexEngine::group);
-    }
-
-    public Optional<String> findFirst(String input, Function<IRegexEngine, String> entryCalculator) {
-        IRegexEngine regexEngine = createEngine(input);
-        return regexEngine.find() ? Optional.of(entryCalculator.apply(regexEngine)) : Optional.empty();
-    }
-
-    public boolean anyMatch(String input) {
-        return createEngine(input).find();
-    }
-
-    public boolean noneMatch(String input) {
-        return !createEngine(input).find();
-    }
-
-    public String removeAll(String input) {
-        return replace(input, regexEngine -> "");
-    }
-
-    @SneakyThrows
-    public IRegexEngine createEngine(String input) {
-        return IRegexEngine.IMPLEMENTATIONS.get(impl)
-                .getDeclaredConstructor(String.class, int.class, String.class)
-                .newInstance(regex, flags, input);
-    }
-
-    public interface IReplacementCalculator {
-        String calculateReplacement(IRegexEngine regexEngine);
-    }
-
-    public interface IEntryProcessor {
-        void processEntry(IRegexEngine regexEngine);
-    }
-
-}
diff --git a/src/main/resources/webapp/pdf-exporter-admin/pages/about.jsp b/src/main/resources/webapp/pdf-exporter-admin/pages/about.jsp
index ef71789..256a009 100644
--- a/src/main/resources/webapp/pdf-exporter-admin/pages/about.jsp
+++ b/src/main/resources/webapp/pdf-exporter-admin/pages/about.jsp
@@ -1,145 +1,2 @@
-<%@ page import="ch.sbb.polarion.extension.generic.properties.CurrentExtensionConfiguration" %>
-<%@ page import="ch.sbb.polarion.extension.generic.rest.model.Version" %>
-<%@ page import="ch.sbb.polarion.extension.generic.util.ExtensionInfo" %>
-<%@ page import="ch.sbb.polarion.extension.generic.util.VersionUtils" %>
-<%@ page import="java.util.Collections" %>
-<%@ page import="java.util.Properties" %>
-<%@ page import="java.io.InputStream" %>
-<%@ page import="java.nio.charset.StandardCharsets" %>
-<%@ page import="java.util.List" %>
-<%@ page import="java.util.Set" %>
-<%@ page import="java.util.ArrayList" %>
-<%@ page import="ch.sbb.polarion.extension.generic.rest.model.Context" %>
-<%@ page import="ch.sbb.polarion.extension.pdf.exporter.util.configuration.ConfigurationStatusUtils" %>
-<%@ page import="ch.sbb.polarion.extension.pdf.exporter.rest.model.configuration.ConfigurationStatus" %>
-<%@ page import="java.util.Arrays" %>
 <%@ page contentType="text/html; charset=UTF-8" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-
-<%!
-    private static final String ABOUT_TABLE_ROW = "<tr><td>%s</td><td>%s</td></tr>";
-    private static final String CONFIGURATION_PROPERTIES_TABLE_ROW = "<tr><td>%s</td><td>%s</td></tr>";
-    private static final String CHECK_CONFIGURATION_TABLE_ROW = "<tr><td>%s</td><td>%s</td><td>%s</td></tr>";
-
-    Context context = ExtensionInfo.getInstance().getContext();
-    Version version = ExtensionInfo.getInstance().getVersion();
-    Properties properties = CurrentExtensionConfiguration.getInstance().getExtensionConfiguration().getProperties();
-%>
-
-<head>
-    <title></title>
-    <link rel="stylesheet" href="../ui/generic/css/common.css?bundle=<%= version.getBundleBuildTimestampDigitsOnly() %>">
-    <link rel="stylesheet" href="../ui/generic/css/about.css?bundle=<%= version.getBundleBuildTimestampDigitsOnly() %>">
-    <link rel="stylesheet" href="../ui/generic/css/github-markdown-light.css?bundle=<%= version.getBundleBuildTimestampDigitsOnly() %>">
-</head>
-
-<body>
-<div class="standard-admin-page about-page">
-    <h1>About</h1>
-
-    <div class="about-page-text">
-        <img class="app-icon" src="../ui/images/app-icon.svg?bundle=<%= version.getBundleBuildTimestampDigitsOnly() %>" alt="" onerror="this.style.display='none'"/>
-
-        <h3>Extension info</h3>
-
-        <table>
-            <thead>
-            <tr>
-                <th>Manifest entry</th>
-                <th>Value</th>
-            </tr>
-            </thead>
-            <tbody>
-            <%
-                out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.BUNDLE_NAME, version.getBundleName()));
-                out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.BUNDLE_VENDOR, version.getBundleVendor()));
-                if (version.getSupportEmail() != null) {
-                    String mailToLink = "<a target=\"_blank\" href=\"mailto:%s\">%s</a>".formatted(version.getSupportEmail(), version.getSupportEmail());
-                    out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.SUPPORT_EMAIL, mailToLink));
-                }
-                out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.AUTOMATIC_MODULE_NAME, version.getAutomaticModuleName()));
-                out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.BUNDLE_VERSION, version.getBundleVersion()));
-                out.println(ABOUT_TABLE_ROW.formatted(VersionUtils.BUNDLE_BUILD_TIMESTAMP, version.getBundleBuildTimestamp()));
-            %>
-            </tbody>
-        </table>
-
-        <h3>Extension configuration properties</h3>
-
-        <table>
-            <thead>
-            <tr>
-                <th>Configuration property</th>
-                <th>Value</th>
-            </tr>
-            </thead>
-            <tbody>
-            <%
-                Set<Object> keySet = properties.keySet();
-                List<String> propertyNames = new ArrayList<>();
-                for (Object key : keySet) {
-                    propertyNames.add((String) key);
-                }
-                Collections.sort(propertyNames);
-
-                for (String key : propertyNames) {
-                    String value = properties.getProperty(key);
-                    String row = CONFIGURATION_PROPERTIES_TABLE_ROW.formatted(key, value);
-                    out.println(row);
-                }
-            %>
-            </tbody>
-        </table>
-
-        <h3>Extension configuration status</h3>
-
-        <table>
-            <thead>
-            <tr>
-                <th>Configuration</th>
-                <th>Status</th>
-                <th>Info</th>
-            </tr>
-            </thead>
-            <tbody>
-            <%
-                String scope = request.getParameter("scope");
-
-                List<ConfigurationStatus> statusList = new ArrayList<>(Arrays.asList(
-                        ConfigurationStatusUtils.getSettingsStatus(scope),
-                        ConfigurationStatusUtils.getDocumentPropertiesPaneStatus(scope),
-                        ConfigurationStatusUtils.getDleToolbarStatus(),
-                        ConfigurationStatusUtils.getLiveReportMainHeadStatus(),
-                        ConfigurationStatusUtils.getCORSStatus()
-                ));
-
-                statusList.addAll(ConfigurationStatusUtils.getWeasyPrintStatus());
-
-                for (ConfigurationStatus configurationStatus : statusList) {
-                    String row = CHECK_CONFIGURATION_TABLE_ROW.formatted(configurationStatus.getName(), configurationStatus.getStatus().toHtml(), configurationStatus.getDetails());
-                    out.println(row);
-                }
-            %>
-            </tbody>
-        </table>
-
-        <input id="scope" type="hidden" value="<%= request.getParameter("scope")%>"/>
-
-        <article class="markdown-body">
-            <%
-                String extensionContext = context.getExtensionContext();
-                try (InputStream inputStream = ExtensionInfo.class.getResourceAsStream("/webapp/" + extensionContext + "-admin/html/about.html")) {
-                    if (inputStream != null) {
-                        String configurationHelp = new String(inputStream.readAllBytes(), StandardCharsets.UTF_8);
-                        out.println(configurationHelp);
-                    } else {
-                        out.println("No help has been generated during build. Please check <a href=\"" + version.getProjectURL() + "/README.md\" target=\"_blank\">the online documentation</a>.");
-                    }
-                }
-            %>
-        </article>
-    </div>
-</div>
-</body>
-</html>
+<jsp:include page="/common/jsp/about.jsp"/>
\ No newline at end of file
diff --git a/src/main/resources/webapp/pdf-exporter-admin/pages/style-packages.jsp b/src/main/resources/webapp/pdf-exporter-admin/pages/style-packages.jsp
index 16bf253..f95824b 100644
--- a/src/main/resources/webapp/pdf-exporter-admin/pages/style-packages.jsp
+++ b/src/main/resources/webapp/pdf-exporter-admin/pages/style-packages.jsp
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <%! String bundleTimestamp = ch.sbb.polarion.extension.generic.util.VersionUtils.getVersion().getBundleBuildTimestampDigitsOnly(); %>
-<%! Boolean webhooksEnabled = ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled(); %>
+<%! Boolean webhooksEnabled = ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled(); %>
 
 <head>
     <title>PDF Exporter: Style Packages</title>
diff --git a/src/main/resources/webapp/pdf-exporter-admin/pages/webhooks.jsp b/src/main/resources/webapp/pdf-exporter-admin/pages/webhooks.jsp
index b9ad4a3..ebada73 100644
--- a/src/main/resources/webapp/pdf-exporter-admin/pages/webhooks.jsp
+++ b/src/main/resources/webapp/pdf-exporter-admin/pages/webhooks.jsp
@@ -2,7 +2,7 @@
 <html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
 
 <%! String bundleTimestamp = ch.sbb.polarion.extension.generic.util.VersionUtils.getVersion().getBundleBuildTimestampDigitsOnly(); %>
-<%! Boolean webhooksEnabled = ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled(); %>
+<%! Boolean webhooksEnabled = ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled(); %>
 
 <head>
     <title>PDF Exporter: Webhooks</title>
@@ -92,8 +92,7 @@
 
         <jsp:include page='/common/jsp/configurations.jsp'/>
 
-        <h2 class="align-left">List of webhooks <%= ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().areWebhooksEnabled() %>
-        </h2>
+        <h2 class="align-left">List of webhooks <%= ch.sbb.polarion.extension.pdf.exporter.properties.PdfExporterExtensionConfiguration.getInstance().getWebhooksEnabled() %></h2>
         <table id="webhooks-table"><!-- Filled by JS --></table>
         <button class="toolbar-button webhook-button" onclick="Webhooks.addWebhook()" title="Add a webhook" style="margin-top: 10px; margin-left: 3px;">
             <img src='/polarion/ria/images/control/tablePlus.png' alt="Plus">
diff --git a/src/test/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcherTest.java b/src/test/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcherTest.java
deleted file mode 100644
index 992867a..0000000
--- a/src/test/java/ch/sbb/polarion/extension/pdf/exporter/util/regex/RegexMatcherTest.java
+++ /dev/null
@@ -1,106 +0,0 @@
-package ch.sbb.polarion.extension.pdf.exporter.util.regex;
-
-import com.google.re2j.PatternSyntaxException;
-import org.junit.jupiter.api.Test;
-import org.junit.jupiter.api.extension.ExtendWith;
-import org.mockito.junit.jupiter.MockitoExtension;
-
-import java.lang.reflect.InvocationTargetException;
-import java.util.ArrayList;
-import java.util.List;
-import java.util.Optional;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-@ExtendWith(MockitoExtension.class)
-public class RegexMatcherTest {
-
-    private static final String REGEX_TAG = "<(?<tagName>[a-z]+)>";
-
-    @Test
-    void flagsTest() {
-        String input = "Text with <SPAN>tag</SPAN> inside";
-        assertNull(RegexMatcher.get(REGEX_TAG).findFirst(input).orElse(null));
-        assertEquals("<SPAN>", RegexMatcher.get(REGEX_TAG, RegexMatcher.CASE_INSENSITIVE).findFirst(input).orElse(null));
-    }
-
-    @Test
-    void unsupportedRE2JSyntaxTest() {
-        RegexMatcher simpleBackreferenceMatcher = RegexMatcher.get("(')[a-zA-Z]+\\1");
-
-        // backreferences not supported in RE2J
-        PatternSyntaxException exception = (PatternSyntaxException) assertThrows(InvocationTargetException.class,
-                () -> simpleBackreferenceMatcher.findFirst("Text with 'quotedText' inside")).getCause();
-        assertEquals("error parsing regexp: invalid escape sequence: `\\1`", exception.getMessage());
-        // but standard java regex does support them
-        assertEquals("'quotedText'", simpleBackreferenceMatcher.useJavaUtil().findFirst("Text with 'quotedText' inside").orElse(null));
-
-        // same for positive lookaheads (?=
-        RegexMatcher positiveLookaheadMatcher = RegexMatcher.get("[a-z]+(?=\\d)");
-        exception = (PatternSyntaxException) assertThrows(InvocationTargetException.class,
-                () -> positiveLookaheadMatcher.replaceAll("a1 b2 c d4", "beep")).getCause();
-        assertEquals("error parsing regexp: invalid or unsupported Perl syntax: `(?=`", exception.getMessage());
-        assertEquals("beep1 beep2 c beep4", positiveLookaheadMatcher.useJavaUtil().replaceAll("a1 b2 c d4", "beep"));
-
-        // and atomic groups
-        RegexMatcher atomicGroupsMatcher = RegexMatcher.get("a(?>bc|b)c");
-        exception = (PatternSyntaxException) assertThrows(InvocationTargetException.class,
-                () -> atomicGroupsMatcher.anyMatch("abc")).getCause();
-        assertEquals("error parsing regexp: invalid or unsupported Perl syntax: `(?>`", exception.getMessage());
-        assertFalse(atomicGroupsMatcher.useJavaUtil().anyMatch("abc"));
-    }
-
-    @Test
-    void findFirstTest() {
-        RegexMatcher matcher = RegexMatcher.get(REGEX_TAG);
-        String twoEntriesInput = "Text with <i>two</i> <b>tag</b> inside";
-        assertEquals("<i>", matcher.findFirst(twoEntriesInput).orElse(null));
-        assertEquals("i", matcher.findFirst(twoEntriesInput,
-                regexEngine -> regexEngine.group("tagName")).orElse(null));
-        assertEquals(Optional.empty(), matcher.findFirst("Text without tags inside"));
-    }
-
-    @Test
-    void anyAndNoneMatchTest() {
-        RegexMatcher matcher = RegexMatcher.get(REGEX_TAG);
-        assertTrue(matcher.anyMatch("Text with <br> tags inside"));
-        assertFalse(matcher.anyMatch("Text without tags inside"));
-        assertFalse(matcher.noneMatch("Text with <br> tags inside"));
-        assertTrue(matcher.noneMatch("Text without tags inside"));
-    }
-
-    @Test
-    void removeAllTest() {
-        assertEquals("Text with tags inside </br>", RegexMatcher.get(REGEX_TAG).removeAll("Text with <some><random>tags inside </br>"));
-    }
-
-    @Test
-    void processEntryTest() {
-        List<String> tags = new ArrayList<>();
-        RegexMatcher.get(REGEX_TAG).processEntry("Text with <a><few><random> tags inside",
-                regexEngine -> tags.add(regexEngine.group("tagName")));
-        assertEquals("a", tags.get(0));
-        assertEquals("few", tags.get(1));
-        assertEquals("random", tags.get(2));
-    }
-
-    @Test
-    void replaceTest() {
-        assertEquals("Text with {two}{random} tags inside plus one more at the {end}", RegexMatcher.get(REGEX_TAG)
-                .replace("Text with <two><random> tags inside plus one more at the <end>",
-                        regexEngine -> "{%s}".formatted(regexEngine.group("tagName"))));
-
-        // by default quoteReplacement = true
-        assertEquals("Text with $100 tag inside", RegexMatcher.get(REGEX_TAG)
-                .replace("Text with <br> tag inside",
-                        regexEngine -> "$100"));
-
-        assertEquals("Text with br00 tag inside", RegexMatcher.get(REGEX_TAG)
-                .replace("Text with <br> tag inside", false,
-                        regexEngine -> "$100"));
-
-        assertEquals("Text with 4242 tags inside plus one more at the 42", RegexMatcher.get(REGEX_TAG)
-                .replaceAll("Text with <two><random> tags inside plus one more at the <end>", "42"));
-    }
-
-}