From cf9395f304f8300dca62af812d64f0ada9ef1308 Mon Sep 17 00:00:00 2001
From: Quentin Ligier <quentin.ligier@bluewin.ch>
Date: Mon, 22 Jan 2024 22:02:10 +0100
Subject: [PATCH] Implement the new Gazelle validation API

Fixes #141
---
 .idea/misc.xml                                |   1 -
 docs/changelog.md                             |   4 +
 .../engine/tests/CdaToFhirTransformTests.java |   2 +-
 .../ca/uhn/fhir/jpa/starter/Application.java  |   8 +-
 .../jpa/validation/ValidationProvider.java    |  84 +++--
 .../ConformancePackageResourceProvider.java   |  88 +++--
 .../matchbox/IgLoaderFromJpaPackageCache.java |  43 +--
 .../ahdis/matchbox/MatchboxEngineSupport.java |   2 +-
 .../matchbox/gazelle/GazelleValidationWs.java | 310 ++++++++++++++++++
 .../gazelle/models/metadata/Interface.java    | 112 +++++++
 .../gazelle/models/metadata/RestBinding.java  |  43 +++
 .../gazelle/models/metadata/Service.java      | 211 ++++++++++++
 .../models/validation/AssertionReport.java    | 233 +++++++++++++
 .../gazelle/models/validation/Metadata.java   |  53 +++
 .../validation/RequirementPriority.java       |  12 +
 .../models/validation/SeverityLevel.java      |  12 +
 .../models/validation/UnexpectedError.java    |  74 +++++
 .../models/validation/ValidationCounters.java | 167 ++++++++++
 .../models/validation/ValidationItem.java     | 118 +++++++
 .../models/validation/ValidationMethod.java   |  92 ++++++
 .../models/validation/ValidationProfile.java  | 105 ++++++
 .../models/validation/ValidationReport.java   | 253 ++++++++++++++
 .../models/validation/ValidationRequest.java  |  97 ++++++
 .../validation/ValidationSubReport.java       | 267 +++++++++++++++
 .../validation/ValidationTestResult.java      |  12 +
 .../ahdis/matchbox/gazelle/utils/BidMap.java  |  94 ++++++
 .../util/MatchboxPackageInstallerImpl.java    | 103 ++++--
 .../matchbox/util/MatchboxServerUtils.java    |  65 ++++
 28 files changed, 2512 insertions(+), 153 deletions(-)
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/GazelleValidationWs.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/Interface.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/RestBinding.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/Service.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/AssertionReport.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/Metadata.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/RequirementPriority.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/SeverityLevel.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/UnexpectedError.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationCounters.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationItem.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationMethod.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationProfile.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationReport.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationRequest.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationSubReport.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationTestResult.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/utils/BidMap.java
 create mode 100644 matchbox-server/src/main/java/ch/ahdis/matchbox/util/MatchboxServerUtils.java

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 260c900cc41..b4a47a3b74b 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -21,7 +21,6 @@
         <option value="$PROJECT_DIR$/matchbox-terminology/pom.xml" />
       </set>
     </option>
-    <option name="workspaceImportForciblyTurnedOn" value="true" />
   </component>
   <component name="ProjectRootManager" version="2" languageLevel="JDK_20" default="true" project-jdk-name="temurin-20" project-jdk-type="JavaSDK" />
   <component name="ProjectType">
diff --git a/docs/changelog.md b/docs/changelog.md
index 0574495f379..99025809616 100644
--- a/docs/changelog.md
+++ b/docs/changelog.md
@@ -1,3 +1,7 @@
+2024/XX/YY Release 3.6.1
+
+- Implemented the new Gazelle validation API [#141](https://github.com/ahdis/matchbox/issues/141)
+
 2024/02/27 Release 3.6.0
 
 - `docker pull europe-west6-docker.pkg.dev/ahdis-ch/ahdis/matchbox:v3.6.0`
diff --git a/matchbox-engine/src/test/java/ch/ahdis/matchbox/engine/tests/CdaToFhirTransformTests.java b/matchbox-engine/src/test/java/ch/ahdis/matchbox/engine/tests/CdaToFhirTransformTests.java
index f139ea7357b..6464ab4adf3 100644
--- a/matchbox-engine/src/test/java/ch/ahdis/matchbox/engine/tests/CdaToFhirTransformTests.java
+++ b/matchbox-engine/src/test/java/ch/ahdis/matchbox/engine/tests/CdaToFhirTransformTests.java
@@ -162,7 +162,7 @@ void TestObservation() throws FHIRException, IOException {
 		assertNotNull(resource);
 	}
 
-    @Test
+	@Test
 	void TestObservationSt() throws FHIRException, IOException {
 		InputStream in = getResourceAsStream("cda-it-observation-st.xml");
 
diff --git a/matchbox-server/src/main/java/ca/uhn/fhir/jpa/starter/Application.java b/matchbox-server/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
index 5e0a8592910..6602152c5b8 100644
--- a/matchbox-server/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
+++ b/matchbox-server/src/main/java/ca/uhn/fhir/jpa/starter/Application.java
@@ -1,6 +1,7 @@
 package ca.uhn.fhir.jpa.starter;
 
 import ch.ahdis.matchbox.spring.MatchboxEventListener;
+import ch.ahdis.matchbox.gazelle.GazelleValidationWs;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.boot.SpringApplication;
@@ -26,7 +27,8 @@
 	MdmConfig.class,
 	MatchboxJpaConfig.class,
 	FhirServerConfigR4.class,
-	MatchboxEventListener.class})
+	MatchboxEventListener.class,
+	GazelleValidationWs.class})
 public class Application extends SpringBootServletInitializer {
 
   public static void main(String[] args) {
@@ -48,8 +50,8 @@ protected SpringApplicationBuilder configure(
 
   @Bean
   @Conditional(OnEitherVersion.class)
-  public ServletRegistrationBean hapiServletRegistration(RestfulServer restfulServer) {
-    ServletRegistrationBean servletRegistrationBean = new ServletRegistrationBean();
+  public ServletRegistrationBean<RestfulServer> hapiServletRegistration(RestfulServer restfulServer) {
+    ServletRegistrationBean<RestfulServer> servletRegistrationBean = new ServletRegistrationBean<>();
     beanFactory.autowireBean(restfulServer);
     servletRegistrationBean.setServlet(restfulServer);
     servletRegistrationBean.addUrlMappings("/fhir/*");
diff --git a/matchbox-server/src/main/java/ch/ahdis/fhir/hapi/jpa/validation/ValidationProvider.java b/matchbox-server/src/main/java/ch/ahdis/fhir/hapi/jpa/validation/ValidationProvider.java
index 1b889688c8f..9ea62b0f12f 100644
--- a/matchbox-server/src/main/java/ch/ahdis/fhir/hapi/jpa/validation/ValidationProvider.java
+++ b/matchbox-server/src/main/java/ch/ahdis/fhir/hapi/jpa/validation/ValidationProvider.java
@@ -21,12 +21,10 @@
  */
 
 import ca.uhn.fhir.context.FhirContext;
-import ca.uhn.fhir.jpa.dao.data.INpmPackageVersionDao;
 import ca.uhn.fhir.rest.annotation.Operation;
 import ca.uhn.fhir.rest.annotation.OperationParam;
 import ca.uhn.fhir.rest.api.EncodingEnum;
 import ca.uhn.fhir.util.StopWatch;
-import ca.uhn.fhir.validation.ResultSeverityEnum;
 import ca.uhn.fhir.validation.SingleValidationMessage;
 import ch.ahdis.matchbox.CliContext;
 import ch.ahdis.matchbox.MatchboxEngineSupport;
@@ -34,19 +32,16 @@
 import ch.ahdis.matchbox.engine.cli.VersionUtil;
 import org.apache.commons.beanutils.BeanUtils;
 import org.apache.commons.codec.digest.DigestUtils;
-import org.apache.commons.io.IOUtils;
 import org.checkerframework.checker.nullness.qual.NonNull;
 import org.hl7.fhir.convertors.factory.VersionConvertorFactory_40_50;
 import org.hl7.fhir.instance.model.api.IBase;
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.r4.model.StructureDefinition;
 import org.hl7.fhir.r5.elementmodel.Manager.FhirFormat;
-import org.hl7.fhir.r5.model.DateTimeType;
-import org.hl7.fhir.r5.model.DateType;
 import org.hl7.fhir.r5.model.Duration;
 import org.hl7.fhir.r5.model.OperationOutcome;
 import org.hl7.fhir.r5.model.StringType;
-import org.hl7.fhir.r5.model.TimeType;
+import org.hl7.fhir.r5.utils.EOperationOutcome;
 import org.hl7.fhir.r5.model.UriType;
 import org.hl7.fhir.r5.utils.OperationOutcomeUtilities;
 import org.hl7.fhir.r5.utils.ToolingExtensions;
@@ -104,7 +99,7 @@ public IBaseResource validate(final HttpServletRequest theRequest) {
 		log.debug("$validate");
 		final ArrayList<SingleValidationMessage> addedValidationMessages = new ArrayList<>();
 
-		final StopWatch sw = new StopWatch();
+		final var sw = new StopWatch();
 		sw.startTask("Total");
 
 		// we extract here all config
@@ -142,7 +137,13 @@ public IBaseResource validate(final HttpServletRequest theRequest) {
 			reload = theRequest.getParameter("reload").equals("true");
 		}
 
-		final String contentString = this.getContentString(theRequest, addedValidationMessages);
+		String contentString = "";
+		try {
+			contentString = new String(theRequest.getInputStream().readAllBytes(), StandardCharsets.UTF_8);
+		} catch (final Exception e) {
+			log.error(e.getMessage(), e);
+		}
+
 		if (contentString.isEmpty()) {
 			return this.getOoForError("No content provided in HTTP body");
 		} else {
@@ -174,10 +175,7 @@ public IBaseResource validate(final HttpServletRequest theRequest) {
 
 		final List<ValidationMessage> messages;
 		try {
-			final var format = encoding == EncodingEnum.XML ? FhirFormat.XML : FhirFormat.JSON;
-			final var stream = new ByteArrayInputStream(contentString.getBytes(StandardCharsets.UTF_8));
-			messages = engine.validate(format, stream, profile);
-
+			messages = doValidate(engine, contentString, encoding, profile);
 		} catch (final Exception e) {
 			sw.endCurrentTask();
 			log.debug("Validation time: {}", sw);
@@ -187,36 +185,10 @@ public IBaseResource validate(final HttpServletRequest theRequest) {
 
 		long millis = sw.getMillis();
 		log.debug("Validation time: {}", sw);
-		
+
 		return this.getOperationOutcome(sha3Hex, messages, profile, engine, millis, cliContext);
 	}
 
-	private String getContentString(final HttpServletRequest theRequest,
-											  final List<SingleValidationMessage> addedValidationMessages) {
-		byte[] bytes = null;
-		String contentString = "";
-		try {
-			bytes = IOUtils.toByteArray(theRequest.getInputStream());
-			if (bytes.length > 2 && bytes[0] == -17 && bytes[1] == -69 && bytes[2] == -65) {
-				byte[] dest = new byte[bytes.length - 3];
-				System.arraycopy(bytes, 3, dest, 0, bytes.length - 3);
-				bytes = dest;
-				if (addedValidationMessages != null) {
-					final var m = new SingleValidationMessage();
-					m.setSeverity(ResultSeverityEnum.WARNING);
-					m.setMessage(
-						"Resource content has a UTF-8 BOM marking, skipping BOM, see https://en.wikipedia.org/wiki/Byte_order_mark");
-					m.setLocationCol(0);
-					m.setLocationLine(0);
-					addedValidationMessages.add(m);
-				}
-			}
-			contentString = new String(bytes);
-		} catch (final IOException e) {
-			log.error(e.getMessage(), e);
-		}
-		return contentString;
-	}
 
 	private IBaseResource getOperationOutcome(final String id,
 															final List<ValidationMessage> messages,
@@ -234,7 +206,6 @@ private IBaseResource getOperationOutcome(final String id,
 			issue.setCode(OperationOutcome.IssueType.INFORMATIONAL);
 
 			final StructureDefinition structDef = engine.getStructureDefinition(profile);
-
 			final org.hl7.fhir.r5.model.StructureDefinition structDefR5 = (org.hl7.fhir.r5.model.StructureDefinition) VersionConvertorFactory_40_50.convertResource(structDef);
 
 			final var profileDate = (structDef.getDateElement() != null)
@@ -247,7 +218,7 @@ private IBaseResource getOperationOutcome(final String id,
 					structDef.getVersion(),
 					profileDate,
 					String.join(", ", engine.getContext().getLoadedPackages()),
-					"" + ms/1000.0+ "s",
+					ms/1000.0+ "s",
 					VersionUtil.getPoweredBy(),
 					cliContext.toString()
 				));
@@ -258,9 +229,7 @@ private IBaseResource getOperationOutcome(final String id,
 			ext.addExtension("profileDate", structDefR5.getDateElement());
 
 			ext.addExtension("total", new Duration().setUnit("ms").setValue(ms) );
-			if (matchboxEngineSupport.getSessionId(engine) != null) {
-				ext.addExtension("validatorVersion", new StringType(VersionUtil.getPoweredBy()));
-			}
+			ext.addExtension("validatorVersion", new StringType(VersionUtil.getPoweredBy()));
 			cliContext.addContextToExtension(ext);
 			if (matchboxEngineSupport.getSessionId(engine) != null) {
 				ext.addExtension("sessionId", new StringType(matchboxEngineSupport.getSessionId(engine)));
@@ -273,6 +242,10 @@ private IBaseResource getOperationOutcome(final String id,
 
 		// Map the SingleValidationMessages to OperationOutcomeIssue
 		for (final ValidationMessage message : messages) {
+			if (message.getType() == null) {
+				// TODO: this did not happen with other core versions
+				message.setType(ValidationMessage.IssueType.UNKNOWN);
+			}
 			final var issue = OperationOutcomeUtilities.convertToIssue(message, oo);
 
 			// Note: the message is mapped to details.text by HAPI, but we still need it in diagnostics for the EVSClient,
@@ -319,4 +292,27 @@ private IBaseResource getOoForError(final @NonNull String message) {
 		issue.addExtension().setUrl(ToolingExtensions.EXT_ISSUE_SOURCE).setValue(new StringType("ValidationProvider"));
 		return VersionConvertorFactory_40_50.convertResource(oo);
 	}
+
+	public static List<ValidationMessage> doValidate(final MatchboxEngine engine,
+									 String content,
+									 final EncodingEnum encoding,
+									 final String profile) throws EOperationOutcome, IOException {
+		final List<ValidationMessage> messages = new ArrayList<>();
+
+		if (content.startsWith("\uFEFF")) {
+			content = content.replace("\uFEFF", "");
+			final var m = new ValidationMessage();
+			m.setLevel(ValidationMessage.IssueSeverity.WARNING);
+			m.setMessage(
+				"Resource content has a UTF-8 BOM marking, skipping BOM, see https://en.wikipedia.org/wiki/Byte_order_mark");
+			m.setCol(0);
+			m.setLine(0);
+			messages.add(m);
+		}
+
+		final var format = encoding == EncodingEnum.XML ? FhirFormat.XML : FhirFormat.JSON;
+		final var stream = new ByteArrayInputStream(content.getBytes(StandardCharsets.UTF_8));
+		messages.addAll(engine.validate(format, stream, profile));
+		return messages;
+	}
 }
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/ConformancePackageResourceProvider.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/ConformancePackageResourceProvider.java
index 3ae094084d9..a32d5e528bf 100644
--- a/matchbox-server/src/main/java/ch/ahdis/matchbox/ConformancePackageResourceProvider.java
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/ConformancePackageResourceProvider.java
@@ -2,13 +2,10 @@
 
 import java.io.IOException;
 import java.nio.charset.StandardCharsets;
-import java.util.ArrayList;
-import java.util.Date;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
+import java.util.*;
 import java.util.stream.Collectors;
 
+import ch.ahdis.matchbox.util.MatchboxServerUtils;
 import jakarta.servlet.http.HttpServletRequest;
 
 import org.hl7.fhir.convertors.factory.VersionConvertorFactory_40_50;
@@ -17,10 +14,7 @@
 import org.hl7.fhir.instance.model.api.IBaseResource;
 import org.hl7.fhir.instance.model.api.IDomainResource;
 import org.hl7.fhir.instance.model.api.IIdType;
-import org.hl7.fhir.r4.model.CanonicalType;
-import org.hl7.fhir.r4.model.MetadataResource;
-import org.hl7.fhir.r4.model.OperationOutcome;
-import org.hl7.fhir.r4.model.Resource;
+import org.hl7.fhir.r4.model.*;
 import org.quartz.DisallowConcurrentExecution;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.data.domain.PageRequest;
@@ -204,43 +198,47 @@ public ca.uhn.fhir.rest.api.server.IBundleProvider search(jakarta.servlet.http.H
 
 	public List<CanonicalType> getCanonicals() {
 		return new TransactionTemplate(myTxManager).execute(tx -> {
-			Slice<NpmPackageVersionResourceEntity> outcome = myPackageVersionResourceDao
-					.findByResourceType(PageRequest.of(0, 2147483646), resourceType);
-			List<String> versioned = outcome.stream().filter(t -> !t.getPackageVersion().isCurrentVersion())
-					.map(t -> (t.getCanonicalUrl() + "|" + t.getCanonicalVersion())).collect(Collectors.toList());
-			Slice<NpmPackageVersionResourceEntity> current = myPackageVersionResourceDao
-					.findCurrentByResourceType(PageRequest.of(0, 2147483646), resourceType);
-			versioned.addAll(current.stream().map(t -> (t.getCanonicalUrl())).collect(Collectors.toList()));
-			return versioned.stream().sorted().map(t -> new CanonicalType(t)).collect(Collectors.toList());
+			final var page = PageRequest.of(0, 2147483646);
+			final var currentEntityIds =
+				this.myPackageVersionResourceDao.findCurrentByResourceType(page, this.resourceType)
+					.stream()
+					.map(NpmPackageVersionResourceEntity::getId)
+					.collect(Collectors.toUnmodifiableSet());
+
+			return this.myPackageVersionResourceDao.findByResourceType(page, this.resourceType)
+				.stream()
+				.sorted(Comparator
+							  .comparing(NpmPackageVersionResourceEntity::getCanonicalUrl)
+							  .thenComparing(NpmPackageVersionResourceEntity::getCanonicalVersion))
+				.map(entity -> {
+					final var canonical = new CanonicalType(entity.getCanonicalUrl());
+					canonical.addExtension().setUrl("ig-id").setValue(new StringType(entity.getPackageVersion().getPackageId()));
+					canonical.addExtension().setUrl("ig-version").setValue(new StringType(entity.getCanonicalVersion()));
+					canonical.addExtension().setUrl("ig-current").setValue(new BooleanType(currentEntityIds.contains(entity.getId())));
+					canonical.addExtension().setUrl("sd-canonical").setValue(new StringType(entity.getCanonicalUrl()));
+					if (entity.getFilename() != null && !entity.getFilename().isBlank()) {
+						canonical.addExtension().setUrl("sd-title").setValue(new StringType(entity.getFilename()));
+					} else {
+						canonical.addExtension().setUrl("sd-title").setValue(new StringType(entity.getCanonicalUrl()));
+					}
+					return canonical;
+				})
+				.toList();
 		});
 	}
 
-	/**
-	 * Helper method which will attempt to use the IBinaryStorageSvc to resolve the
-	 * binary blob if available. If the bean is unavailable, fallback to assuming we
-	 * are using an embedded base64 in the data element.
-	 * 
-	 * @param theBinary the Binary who's `data` blob you want to retrieve
-	 * @return a byte array containing the blob.
-	 *
-	 * @throws IOException
-	 */
-	private byte[] fetchBlobFromBinary(IBaseBinary theBinary) throws IOException {
-		if (myBinaryStorageSvc != null && !(myBinaryStorageSvc instanceof NullBinaryStorageSvcImpl)) {
-			return myBinaryStorageSvc.fetchDataBlobFromBinary(theBinary);
-		} else {
-			byte[] value = BinaryUtil.getOrCreateData(myCtx, theBinary).getValue();
-			if (value == null) {
-				throw new InternalErrorException(
-						Msg.code(1296) + "Failed to fetch blob from Binary/" + theBinary.getIdElement());
-			}
-			return value;
-		}
+	public List<NpmPackageVersionResourceEntity> getPackageResources() {
+		return new TransactionTemplate(this.myTxManager).execute(tx -> {
+			return myPackageVersionResourceDao
+				.findByResourceType(PageRequest.of(0, 2147483646), resourceType).stream().toList();
+		});
 	}
 
-	@SuppressWarnings("unchecked")
-	private IFhirResourceDao<IBaseBinary> getBinaryDao() {
-		return myDaoRegistry.getResourceDao("Binary");
+	public List<NpmPackageVersionResourceEntity> getCurrentPackageResources() {
+		return new TransactionTemplate(this.myTxManager).execute(tx -> {
+			return myPackageVersionResourceDao
+				.findCurrentByResourceType(PageRequest.of(0, 2147483646), resourceType).stream().toList();
+		});
 	}
 
 	private IBaseResource loadPackageEntityAdjustId(NpmPackageVersionResourceEntity contents) {
@@ -270,10 +268,10 @@ public org.hl7.fhir.r5.model.CanonicalResource getCanonical(IBaseResource theRes
 
 	private IBaseResource loadPackageEntity(NpmPackageVersionResourceEntity contents) {
 		try {
-			JpaPid binaryPid = JpaPid.fromId(contents.getResourceBinary().getId());
-			IBaseBinary binary = getBinaryDao().readByPid(binaryPid);
-			byte[] resourceContentsBytes = fetchBlobFromBinary(binary);
-			String resourceContents = new String(resourceContentsBytes, StandardCharsets.UTF_8);
+			final var binary = MatchboxServerUtils.getBinaryFromId(contents.getResourceBinary().getId(), myDaoRegistry);
+			final byte[] resourceContentsBytes = MatchboxServerUtils.fetchBlobFromBinary(binary, myBinaryStorageSvc,
+																												  myCtx);
+			final String resourceContents = new String(resourceContentsBytes, StandardCharsets.UTF_8);
 			switch (contents.getFhirVersion()) {
 				case R4:
 					return new org.hl7.fhir.r4.formats.JsonParser().parse(resourceContents);
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/IgLoaderFromJpaPackageCache.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/IgLoaderFromJpaPackageCache.java
index dfd9736fa9f..5e3a2f363e0 100644
--- a/matchbox-server/src/main/java/ch/ahdis/matchbox/IgLoaderFromJpaPackageCache.java
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/IgLoaderFromJpaPackageCache.java
@@ -30,6 +30,7 @@
 
 import javax.annotation.Nonnull;
 
+import ch.ahdis.matchbox.util.MatchboxServerUtils;
 import org.hl7.fhir.convertors.factory.VersionConvertorFactory_30_50;
 import org.hl7.fhir.convertors.factory.VersionConvertorFactory_40_50;
 import org.hl7.fhir.convertors.factory.VersionConvertorFactory_43_50;
@@ -97,34 +98,6 @@ public IgLoaderFromJpaPackageCache(FilesystemPackageCacheManager packageCacheMan
 		this.myTxManager = myTxManager;
 	}
 
-	/**
-	 * Helper method which will attempt to use the IBinaryStorageSvc to resolve the
-	 * binary blob if available. If the bean is unavailable, fallback to assuming we
-	 * are using an embedded base64 in the data element.
-	 * 
-	 * @param theBinary the Binary who's `data` blob you want to retrieve
-	 * @return a byte array containing the blob.
-	 *
-	 * @throws IOException
-	 */
-	private byte[] fetchBlobFromBinary(IBaseBinary theBinary) throws IOException {
-		if (myBinaryStorageSvc != null && !(myBinaryStorageSvc instanceof NullBinaryStorageSvcImpl)) {
-			return myBinaryStorageSvc.fetchDataBlobFromBinary(theBinary);
-		} else {
-			byte[] value = BinaryUtil.getOrCreateData(myCtx, theBinary).getValue();
-			if (value == null) {
-				throw new InternalErrorException(
-						Msg.code(1296) + "Failed to fetch blob from Binary/" + theBinary.getIdElement());
-			}
-			return value;
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private IFhirResourceDao<IBaseBinary> getBinaryDao() {
-		return myDaoRegistry.getResourceDao("Binary");
-	}
-
 	@Nonnull
 	public FhirContext getFhirContext(FhirVersionEnum theFhirVersion) {
 		return myVersionToContext.computeIfAbsent(theFhirVersion, v -> new FhirContext(v));
@@ -132,10 +105,10 @@ public FhirContext getFhirContext(FhirVersionEnum theFhirVersion) {
 
 	private org.hl7.fhir.r5.model.Resource loadPackageEntity(NpmPackageVersionResourceEntity contents) {
 		try {
-			JpaPid binaryPid = JpaPid.fromId(contents.getResourceBinary().getId());
-			IBaseBinary binary = getBinaryDao().readByPid(binaryPid);
-			byte[] resourceContentsBytes = fetchBlobFromBinary(binary);
-			String resourceContents = new String(resourceContentsBytes, StandardCharsets.UTF_8);
+			final var binary = MatchboxServerUtils.getBinaryFromId(contents.getResourceBinary().getId(), myDaoRegistry);
+			final byte[] resourceContentsBytes = MatchboxServerUtils.fetchBlobFromBinary(binary, myBinaryStorageSvc,
+																												  myCtx);
+			final String resourceContents = new String(resourceContentsBytes, StandardCharsets.UTF_8);
 			switch (contents.getFhirVersion()) {
 			case DSTU3:
 				return VersionConvertorFactory_30_50
@@ -270,11 +243,9 @@ private NpmPackage loadPackage(NpmPackageVersionEntity thePackageVersion) {
 	}
 
 	private IHapiPackageCacheManager.PackageContents loadPackageContents(NpmPackageVersionEntity thePackageVersion) {
-		IFhirResourceDao<? extends IBaseBinary> binaryDao = getBinaryDao();
-		JpaPid binaryPid = JpaPid.fromId(thePackageVersion.getPackageBinary().getId());
-		IBaseBinary binary = binaryDao.readByPid(binaryPid);
+		final var binary = MatchboxServerUtils.getBinaryFromId(thePackageVersion.getPackageBinary().getId(), myDaoRegistry);
 		try {
-			byte[] content = fetchBlobFromBinary(binary);
+			final byte[] content = MatchboxServerUtils.fetchBlobFromBinary(binary, myBinaryStorageSvc, myCtx);
 			PackageContents retVal = new PackageContents().setBytes(content).setPackageId(thePackageVersion.getPackageId())
 					.setVersion(thePackageVersion.getVersionId()).setLastModified(thePackageVersion.getUpdatedTime());
 			return retVal;
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/MatchboxEngineSupport.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/MatchboxEngineSupport.java
index e57d1a95335..b5303a8e7d1 100644
--- a/matchbox-server/src/main/java/ch/ahdis/matchbox/MatchboxEngineSupport.java
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/MatchboxEngineSupport.java
@@ -36,7 +36,7 @@ public class MatchboxEngineSupport {
 	
 	protected static final org.slf4j.Logger log = org.slf4j.LoggerFactory.getLogger(MatchboxEngineSupport.class);
 
-	private static MatchboxEngine mainEngine = null;
+	public static MatchboxEngine mainEngine = null;
 	private EngineSessionCache sessionCache;
 	
 	private boolean initialized = false;
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/GazelleValidationWs.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/GazelleValidationWs.java
new file mode 100644
index 00000000000..c5e7fa9fadc
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/GazelleValidationWs.java
@@ -0,0 +1,310 @@
+package ch.ahdis.matchbox.gazelle;
+
+import ca.uhn.fhir.rest.api.EncodingEnum;
+import ca.uhn.fhir.util.StopWatch;
+import ch.ahdis.fhir.hapi.jpa.validation.ValidationProvider;
+import ch.ahdis.matchbox.CliContext;
+import ch.ahdis.matchbox.MatchboxEngineSupport;
+import ch.ahdis.matchbox.StructureDefinitionResourceProvider;
+import ch.ahdis.matchbox.engine.MatchboxEngine;
+import ch.ahdis.matchbox.engine.cli.VersionUtil;
+import ch.ahdis.matchbox.engine.exception.MatchboxEngineCreationException;
+import ch.ahdis.matchbox.gazelle.models.metadata.Interface;
+import ch.ahdis.matchbox.gazelle.models.metadata.RestBinding;
+import ch.ahdis.matchbox.gazelle.models.metadata.Service;
+import ch.ahdis.matchbox.gazelle.models.validation.*;
+import org.hl7.fhir.convertors.factory.VersionConvertorFactory_40_50;
+import org.hl7.fhir.r4.model.StructureDefinition;
+import org.hl7.fhir.r5.model.Duration;
+import org.hl7.fhir.r5.model.StringType;
+import org.hl7.fhir.r5.model.UriType;
+import org.hl7.fhir.utilities.validation.ValidationMessage;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.web.bind.annotation.*;
+
+import jakarta.servlet.http.HttpServletRequest;
+import java.lang.reflect.Field;
+import java.nio.charset.StandardCharsets;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+import java.util.stream.Collectors;
+
+/**
+ * The WebService for validation with the new Gazelle Validation API.
+ *
+ * @author Quentin Ligier
+ **/
+@RestController
+@RequestMapping(path = "/gazelle")
+public class GazelleValidationWs {
+	private static final Logger log = LoggerFactory.getLogger(GazelleValidationWs.class);
+
+	/**
+	 * HTTP paths.
+	 */
+	private static final String METADATA_PATH = "/metadata";
+	private static final String PROFILES_PATH = "/validation/profiles";
+	private static final String VALIDATE_PATH = "/validation/validate";
+
+	private final MatchboxEngineSupport matchboxEngineSupport;
+
+	private final StructureDefinitionResourceProvider structureDefinitionProvider;
+
+	private final CliContext cliContext;
+
+	public GazelleValidationWs(final MatchboxEngineSupport matchboxEngineSupport,
+										final CliContext cliContext,
+										final StructureDefinitionResourceProvider structureDefinitionProvider) {
+		this.matchboxEngineSupport = Objects.requireNonNull(matchboxEngineSupport);
+		this.cliContext = Objects.requireNonNull(cliContext);
+		this.structureDefinitionProvider = Objects.requireNonNull(structureDefinitionProvider);
+	}
+
+	/**
+	 * Returns the metadata of the validation service.
+	 */
+	@GetMapping(path = METADATA_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
+	public Service getMetadata(final HttpServletRequest request) {
+		final var service = new Service();
+		service.setName("Matchbox");
+		service.setVersion(VersionUtil.getVersion());
+		service.setInstanceId("NOT_SET");
+		service.setReplicaId("NOT_SET");
+
+		final var theInterface = new Interface();
+		theInterface.setType("validationInterface");
+		theInterface.setInterfaceName("ValidationInterface");
+		theInterface.setInterfaceVersion("1.0.0");
+		theInterface.setRequired(true);
+
+		final var binding = new RestBinding();
+		//binding.setServiceUrl(request.getRequestURL().toString().replace(METADATA_PATH, VALIDATE_PATH));
+		binding.setServiceUrl("https://3mb7wd5k-8080.euw.devtunnels.ms/matchboxv3/gazelle/validation/validate");
+		binding.setType("restBinding");
+
+		theInterface.setValidationProfiles(this.getProfiles());
+
+		theInterface.addBinding(binding);
+		service.setProvidedInterfaces(List.of(theInterface));
+
+		return service;
+	}
+
+	/**
+	 * Returns the list of profiles supported by this server.
+	 */
+	@GetMapping(path = PROFILES_PATH, produces = MediaType.APPLICATION_JSON_VALUE)
+	public List<ValidationProfile> getProfiles() {
+		return this.structureDefinitionProvider.getCurrentPackageResources().stream()
+			.map(packageVersionResource -> {
+				final var profile = new ValidationProfile();
+				profile.setProfileID(packageVersionResource.getCanonicalUrl());
+				// PATCHed: filename contains the StructureDefinition title.
+				profile.setProfileName(packageVersionResource.getFilename());
+				profile.setDomain(packageVersionResource.getPackageVersion().getPackageId());
+				return profile;
+			}).collect(Collectors.toList());
+	}
+
+	/**
+	 * Performs the validation of the given items with the given profile.
+	 */
+	@PostMapping(path = VALIDATE_PATH, consumes = MediaType.APPLICATION_JSON_VALUE, produces =
+		MediaType.APPLICATION_JSON_VALUE)
+	public ValidationReport postValidate(@RequestBody final ValidationRequest validationRequest) {
+		final var sw = new StopWatch();
+		sw.startTask("Total");
+
+		final var report = new ValidationReport();
+		report.setValidationItems(new ArrayList<>(validationRequest.getValidationItems().size()));
+		report.setReports(new ArrayList<>(validationRequest.getValidationItems().size()));
+		report.setDisclaimer("Matchbox disclaims");
+
+		// Get the Matchbox engine for the requested profile
+		final MatchboxEngine engine;
+		try {
+			engine = this.getEngine(validationRequest.getValidationProfileId());
+		} catch (final Exception exception) {
+			report.addValidationSubReport(unexpectedError(exception.getMessage()));
+			return update(report);
+		}
+		final StructureDefinition structDef = engine.getStructureDefinition(validationRequest.getValidationProfileId());
+
+		// Add the validation method
+		final var method = new ValidationMethod();
+		method.setValidationProfileID(validationRequest.getValidationProfileId());
+		method.setValidationServiceName("Matchbox");
+		method.setValidationServiceVersion(VersionUtil.getVersion());
+		report.setValidationMethod(method);
+
+		// Add validation info
+		report.setAdditionalMetadata(new ArrayList<>(this.cliContext.getValidateEngineParameters().size() + engine.getContext().getLoadedPackages().size() + 6));
+		final var sessionId = this.matchboxEngineSupport.getSessionId(engine);
+		if (sessionId != null) {
+			report.addAdditionalMetadata(new Metadata().setName("sessionId").setValue(sessionId));
+		}
+		report.addAdditionalMetadata(new Metadata().setName("validatorVersion").setValue(VersionUtil.getPoweredBy()));
+		for (final var pkg : engine.getContext().getLoadedPackages()) {
+			report.addAdditionalMetadata(new Metadata().setName("package").setValue(pkg));
+		}
+		report.addAdditionalMetadata(new Metadata().setName("profile").setValue(structDef.getUrl()));
+		report.addAdditionalMetadata(new Metadata().setName("profileVersion").setValue(structDef.getVersion()));
+		report.addAdditionalMetadata(new Metadata().setName("profileDate").setValue(structDef.getDateElement().getValueAsString()));
+
+		// Add the validation parameters as additional metadata
+		for (final Field field : this.cliContext.getValidateEngineParameters()) {
+			field.setAccessible(true);
+			final var metadata = new Metadata();
+			metadata.setName(field.getName());
+			try {
+				metadata.setValue(String.valueOf(field.get(this.cliContext)));
+			} catch (final IllegalAccessException exception) {
+				continue;
+			}
+			report.addAdditionalMetadata(metadata);
+		}
+
+		// Add the validation items (requests) to the response
+		report.getValidationItems().addAll(validationRequest.getValidationItems());
+
+		// Perform the validation of all items with the given engine
+		for (final var item : validationRequest.getValidationItems()) {
+			try {
+				report.addValidationSubReport(this.validateItem(engine, item, validationRequest.getValidationProfileId()));
+			} catch (final Exception exception) {
+				report.addValidationSubReport(unexpectedError(exception.getMessage()));
+			}
+		}
+
+		sw.endCurrentTask();
+		report.addAdditionalMetadata(new Metadata().setName("total").setValue(sw.getMillis() + "ms"));
+
+		return update(report);
+	}
+
+	/**
+	 * Retrieves the Matchbox engine for the given profile.
+	 */
+	MatchboxEngine getEngine(final String profile) {
+		final MatchboxEngine engine;
+		try {
+			engine = this.matchboxEngineSupport.getMatchboxEngine(profile, cliContext, true, false);
+		} catch (final Exception e) {
+			log.error("Error while initializing the validation engine", e);
+			throw new MatchboxEngineCreationException("Error while initializing the validation engine: %s".formatted(e.getMessage()));
+		}
+		if (engine == null || engine.getStructureDefinition(profile) == null) {
+			throw new MatchboxEngineCreationException(
+				"Validation for profile '%s' not supported by this validator instance".formatted(profile));
+		}
+		if (!this.matchboxEngineSupport.isInitialized()) {
+			throw new RuntimeException("Validation engine not initialized, please try again");
+		}
+		return engine;
+	}
+
+	/**
+	 * Performs the validation of the given item with the given engine.
+	 */
+	ValidationSubReport validateItem(final MatchboxEngine engine,
+									 final ValidationItem item,
+									 final String profile) {
+		final String content = new String(item.getContent(), StandardCharsets.UTF_8);
+		final var encoding = EncodingEnum.detectEncoding(content);
+
+		final var subReport = new ValidationSubReport();
+		subReport.setName("Validation of item #%s".formatted(item.getItemId()));
+		try {
+			final var messages = ValidationProvider.doValidate(engine, content, encoding, profile);
+			messages.stream().map(this::convertMessageToReport).forEach(subReport::addAssertionReport);
+		} catch (final Exception e) {
+			log.error("Error during validation", e);
+			subReport.addUnexpectedError(new UnexpectedError().setMessage("Error during validation: %s".formatted(e.getMessage())));
+		}
+
+		return subReport;
+	}
+
+	/**
+	 * Converts a validation message (HAPI) to an assertion report (Gazelle).
+	 */
+	AssertionReport convertMessageToReport(final ValidationMessage message) {
+		final var assertionReport = new AssertionReport();
+		switch (message.getLevel()) {
+			case FATAL, ERROR:
+				assertionReport.setPriority(RequirementPriority.MANDATORY);
+				assertionReport.setResult(ValidationTestResult.FAILED);
+				assertionReport.setSeverity(SeverityLevel.ERROR);
+				break;
+			case WARNING:
+				assertionReport.setPriority(RequirementPriority.RECOMMENDED);
+				assertionReport.setResult(ValidationTestResult.FAILED);
+				assertionReport.setSeverity(SeverityLevel.WARNING);
+				break;
+			case INFORMATION:
+			default:
+				assertionReport.setResult(ValidationTestResult.PASSED); // Can't use UNDEFINED here, because it weights
+				// more than FAILED
+				assertionReport.setSeverity(SeverityLevel.INFO);
+				break;
+		}
+
+		// See AssertionReport#LINE_COL_PATT for the expected format
+		assertionReport.setSubjectLocation("line %d, column %d, FHIRPath: %s".formatted(message.getLine(),
+																											     message.getCol(),
+																												  message.getLocation()));
+
+		/*
+		TODO: invId is only available in later core versions
+		if (message.getInvId() != null) {
+			assertionReport.setAssertionID(message.getInvId());
+		} else */if (message.getMessageId() != null) {
+			assertionReport.setAssertionID(message.getMessageId());
+		}
+		if (message.getSource() != null) {
+			assertionReport.setAssertionType("%s (reported by the %s)".formatted(message.getType().getDisplay(),
+																						            message.getSource().name()));
+		} else {
+			assertionReport.setAssertionType(message.getType().getDisplay());
+		}
+
+		// Description, with slice info if available
+		var description = new StringBuilder();
+		description.append(message.getMessage());
+		if (message.sliceText != null && message.sliceText.length > 0) {
+			description.append("<br/><br/>Slice information:<br/><ul>");
+			for (final var slice : message.sliceText) {
+				description.append("<li>").append(slice).append("</li>");
+			}
+			description.append("</ul>");
+		}
+		assertionReport.setDescription(description.toString());
+		return assertionReport;
+	}
+
+	/**
+	 * Creates a validation sub-report that only contains an unexpected error.
+	 */
+	static ValidationSubReport unexpectedError(final String message) {
+		final var report = new ValidationSubReport();
+		report.setName("Unexpected error");
+		report.setSubReportResult(ValidationTestResult.FAILED);
+		report.addUnexpectedError(new UnexpectedError().setMessage(message));
+		report.getSubCounters().incrementUnexpectedErrors();
+		return report;
+	}
+
+	/**
+	 * Updates the counters and overall result of the given report.
+	 */
+	static ValidationReport update(final ValidationReport report) {
+		report.getReports().forEach(ValidationSubReport::computeCountersSubReport);
+		report.getReports().forEach(ValidationSubReport::computeResultSubReport);
+		report.computeCounters();
+		report.computeOverallResult();
+		return report;
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/Interface.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/Interface.java
new file mode 100644
index 00000000000..62a78804564
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/Interface.java
@@ -0,0 +1,112 @@
+package ch.ahdis.matchbox.gazelle.models.metadata;
+
+import ch.ahdis.matchbox.gazelle.models.validation.ValidationProfile;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+import java.util.ArrayList;
+import java.util.List;
+
+@JsonPropertyOrder({"type", "interfaceName", "interfaceVersion", "required", "bindings"})
+public class Interface {
+
+	@JsonProperty("interfaceName")
+	private String interfaceName;
+
+	@JsonProperty("interfaceVersion")
+	private String interfaceVersion;
+
+	@JsonProperty("required")
+	private boolean required;
+
+	@JsonProperty("bindings")
+	private List<RestBinding> bindings = new ArrayList<>();
+
+	@JsonProperty("type")
+	private String type;
+
+	@JsonProperty("validationProfiles")
+	private List<ValidationProfile> validationProfiles = new ArrayList<>();
+
+	public String getInterfaceName() {
+		return interfaceName;
+	}
+
+	public Interface setInterfaceName(String interfaceName) {
+		this.interfaceName = interfaceName;
+		return this;
+	}
+
+	public String getInterfaceVersion() {
+		return interfaceVersion;
+	}
+
+	public Interface setInterfaceVersion(String interfaceVersion) {
+		this.interfaceVersion = interfaceVersion;
+		return this;
+	}
+
+	public boolean isRequired() {
+		return required;
+	}
+
+	public Interface setRequired(boolean required) {
+		this.required = required;
+		return this;
+	}
+
+	public List<RestBinding> getBindings() {
+		return bindings;
+	}
+
+	public Interface setBindings(List<RestBinding> bindings) {
+		this.bindings = bindings;
+		return this;
+	}
+
+	public Interface addBinding(RestBinding binding) {
+		this.bindings.add(binding);
+		return this;
+	}
+
+	public List<ValidationProfile> getValidationProfiles() {
+		return validationProfiles;
+	}
+
+	public Interface setValidationProfiles(List<ValidationProfile> validationProfiles) {
+		this.validationProfiles = validationProfiles;
+		return this;
+	}
+
+	public Interface addValidationProfile(ValidationProfile validationProfile) {
+		this.validationProfiles.add(validationProfile);
+		return this;
+	}
+
+	public String getType() {
+		return this.type;
+	}
+
+	public Interface setType(String type) {
+		this.type = type;
+		return this;
+	}
+
+	@JsonIgnore
+	public boolean isInterfaceNameValid(){
+		return interfaceName != null && !interfaceName.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isInterfaceVersionValid(){
+		return interfaceVersion != null && !interfaceVersion.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isBindingsValid() {
+		return bindings != null && !bindings.isEmpty();
+	}
+
+}
+
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/RestBinding.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/RestBinding.java
new file mode 100644
index 00000000000..b8d345d4a74
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/RestBinding.java
@@ -0,0 +1,43 @@
+package ch.ahdis.matchbox.gazelle.models.metadata;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+@JsonPropertyOrder({"type","serviceUrl"})
+public class RestBinding {
+
+	@JsonProperty("type")
+	private String type;
+
+	@JsonProperty("serviceUrl")
+	private String serviceUrl;
+
+	public String getType() {
+		return type;
+	}
+
+	public RestBinding setType(String type) {
+		this.type = type;
+		return this;
+	}
+
+	public String getServiceUrl() {
+		return serviceUrl;
+	}
+
+	public RestBinding setServiceUrl(String serviceUrl) {
+		this.serviceUrl = serviceUrl;
+		return this;
+	}
+
+	@JsonIgnore
+	public boolean isServiceUrlValid(){
+		return serviceUrl != null && !serviceUrl.isBlank();
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/Service.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/Service.java
new file mode 100644
index 00000000000..473a7f817f0
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/metadata/Service.java
@@ -0,0 +1,211 @@
+package ch.ahdis.matchbox.gazelle.models.metadata;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * Service metadata used for registration in service-discovery.
+ */
+@JsonTypeName("service")
+@JsonPropertyOrder({"name", "version", "instanceId", "replicaId", "providedInterfaces", "consumedInterfaces"})
+public class Service {
+
+	@JsonProperty(value = "name")
+	private String name;
+
+	@JsonProperty(value = "version")
+	private String version;
+
+	@JsonProperty(value = "instanceId")
+	private String instanceId;
+
+	@JsonProperty(value = "replicaId")
+	private String replicaId;
+
+	@JsonProperty(value = "providedInterfaces")
+	private List<Interface> providedInterfaces;
+
+	@JsonProperty(value = "consumedInterfaces")
+	private List<Interface> consumedInterfaces;
+
+
+	/**
+	 * Get the unique id of this service instance (usually an OID).
+	 *
+	 * @return the service id.
+	 */
+	public String getInstanceId() {
+		return instanceId;
+	}
+
+	/**
+	 * Set the unique id of this service instance (usually an OID).
+	 *
+	 * @param instanceId the id of the service.
+	 *
+	 * @return the current service instance.
+	 */
+	public Service setInstanceId(String instanceId) {
+		this.instanceId = instanceId;
+		return this;
+	}
+
+	/**
+	 * Get the list of interfaces provided by this service.
+	 *
+	 * @return the list of provided interfaces.
+	 */
+	public List<Interface> getProvidedInterfaces() {
+		return providedInterfaces;
+	}
+
+	/**
+	 * Set the list of interfaces provided by this service.
+	 *
+	 * @param providedInterfaces the list of provided interfaces.
+	 *
+	 * @return the current service instance.
+	 */
+	public Service setProvidedInterfaces(List<Interface> providedInterfaces) {
+		this.providedInterfaces = (providedInterfaces);
+		return this;
+	}
+
+	/**
+	 * Get the list of interfaces consumed by this service.
+	 *
+	 * @return the list of consumed interfaces.
+	 */
+	public List<Interface> getConsumedInterfaces() {
+		return consumedInterfaces;
+	}
+
+	/**
+	 * Set the list of interfaces consumed by this service.
+	 *
+	 * @param consumedInterfaces the list of consumed interfaces.
+	 *
+	 * @return the current service instance.
+	 */
+	public Service setConsumedInterfaces(List<Interface> consumedInterfaces) {
+		this.consumedInterfaces = consumedInterfaces;
+		return this;
+	}
+
+	/**
+	 * Get the replica id of this service instance.
+	 *
+	 * @return the replicaId of the service.
+	 */
+	public String getReplicaId() {
+		return replicaId;
+	}
+
+	/**
+	 * Set the replica id of this service instance.
+	 *
+	 * @param replicaId the replica id of the service.
+	 *
+	 * @return the current service instance.
+	 */
+	public Service setReplicaId(String replicaId) {
+		this.replicaId = replicaId;
+		return this;
+	}
+
+	/**
+	 * Get the name of the service.
+	 *
+	 * @return the name of the service.
+	 */
+	public String getName() {
+		return name;
+	}
+
+	/**
+	 * Set the name of the service.
+	 *
+	 * @param name name of the service.
+	 *
+	 * @return the current service instance.
+	 */
+	public Service setName(String name) {
+		this.name = name;
+		return this;
+	}
+
+	/**
+	 * Get the version of the service.
+	 *
+	 * @return the version of the service.
+	 */
+	public String getVersion() {
+		return version;
+	}
+
+	/**
+	 * Set the version of the service.
+	 *
+	 * @param version version number of the service (ex: 1.2.0)
+	 *
+	 * @return the current service instance.
+	 */
+	public Service setVersion(String version) {
+		this.version = version;
+		return this;
+	}
+
+	@JsonIgnore
+	public  boolean isInstanceIdValid() {
+		return instanceId == null || !instanceId.isBlank();
+	}
+
+	@JsonIgnore
+	public  boolean isReplicaIdValid() {
+		return replicaId == null || !replicaId.isBlank();
+	}
+
+	@JsonIgnore
+	public  boolean isNameValid() {
+		return name != null && !name.isBlank();
+	}
+
+	@JsonIgnore
+	public  boolean isVersionValid() {
+		return version != null && !version.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isProvidedInterfacesValid() {
+		return providedInterfaces == null || !providedInterfaces.isEmpty();
+	}
+
+	@JsonIgnore
+	public boolean isConsumedInterfacesValid() {
+		return consumedInterfaces == null || !consumedInterfaces.isEmpty();
+	}
+
+
+	@Override
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		}
+		if (!(o instanceof Service service)) {
+			return false;
+		}
+		return Objects.equals(name, service.name) && Objects.equals(version, service.version);
+	}
+
+	@Override
+	public int hashCode() {
+		return Objects.hash(name, version);
+	}
+}
+
+
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/AssertionReport.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/AssertionReport.java
new file mode 100644
index 00000000000..778be1ec4fe
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/AssertionReport.java
@@ -0,0 +1,233 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.ArrayList;
+import java.util.Arrays;
+import java.util.List;
+import java.util.regex.Pattern;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public class AssertionReport {
+	private String assertionID;
+	private String assertionType;
+	private String description;
+	private String subjectLocation;
+	private String subjectValue;
+	private String[] requirementIDs;
+	private SeverityLevel severity;
+	private RequirementPriority priority = RequirementPriority.MANDATORY;
+	private ValidationTestResult result = ValidationTestResult.PASSED;
+	private List<UnexpectedError> unexpectedErrors;
+	private static final Pattern LINE_COL_PATT = Pattern.compile("line \\d+(, column \\d+)?");
+	private static final Pattern XPATH_PATT = Pattern.compile("(/[^/]+)+");
+
+	public AssertionReport() {
+		this.severity = SeverityLevel.INFO;
+	}
+
+	public String getAssertionID() {
+		return this.assertionID;
+	}
+
+	public AssertionReport setAssertionID(String assertionID) {
+		this.assertionID = assertionID;
+		return this;
+	}
+
+	public String getAssertionType() {
+		return this.assertionType;
+	}
+
+	public AssertionReport setAssertionType(String assertionType) {
+		this.assertionType = assertionType;
+		return this;
+	}
+
+	public String getDescription() {
+		return this.description;
+	}
+
+	public AssertionReport setDescription(String description) {
+		this.description = description;
+		return this;
+	}
+
+	public String getSubjectLocation() {
+		return this.subjectLocation;
+	}
+
+	public AssertionReport setSubjectLocation(String subjectLocation) {
+		this.subjectLocation = subjectLocation;
+		return this;
+	}
+
+	public String getSubjectValue() {
+		return this.subjectValue;
+	}
+
+	public AssertionReport setSubjectValue(String subjectValue) {
+		this.subjectValue = subjectValue;
+		return this;
+	}
+
+	public String[] getRequirementIDs() {
+		return this.requirementIDs;
+	}
+
+	public AssertionReport setRequirementIDs(String[] requirementIDs) {
+		this.requirementIDs = requirementIDs;
+		return this;
+	}
+
+	public SeverityLevel getSeverity() {
+		return this.severity;
+	}
+
+	public AssertionReport setSeverity(SeverityLevel severity) {
+		this.severity = severity;
+		return this;
+	}
+
+	public RequirementPriority getPriority() {
+		return this.priority;
+	}
+
+	public AssertionReport setPriority(RequirementPriority priority) {
+		this.priority = priority;
+		return this;
+	}
+
+	public ValidationTestResult getResult() {
+		return this.result;
+	}
+
+	public AssertionReport setResult(ValidationTestResult result) {
+		this.result = result;
+		return this;
+	}
+
+	public List<UnexpectedError> getUnexpectedErrors() {
+		return this.unexpectedErrors;
+	}
+
+	public AssertionReport setUnexpectedErrors(List<UnexpectedError> unexpectedErrors) {
+		this.unexpectedErrors = unexpectedErrors;
+		return this;
+	}
+
+	public AssertionReport addUnexpectedError(UnexpectedError unexpectedError) {
+		if (this.unexpectedErrors == null) {
+			this.unexpectedErrors = new ArrayList();
+		}
+
+		this.unexpectedErrors.add(unexpectedError);
+		return this;
+	}
+
+	@JsonIgnore
+	public boolean isDescriptionValid() {
+		return this.description != null && !this.description.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isPriorityValid() {
+		return this.priority != null;
+	}
+
+	@JsonIgnore
+	public boolean isSeverityValid() {
+		return this.severity != null;
+	}
+
+	@JsonIgnore
+	public boolean isRequirementIDsValid() {
+		return this.requirementIDs == null || this.requirementIDs.length > 0;
+	}
+
+	@JsonIgnore
+	public boolean isAssertionTypeValid() {
+		return this.assertionType == null || !this.assertionType.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isAssertionIDValid() {
+		return this.assertionID == null || !this.assertionID.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isUnexpectedErrorsValid() {
+		return this.unexpectedErrors == null || !this.unexpectedErrors.isEmpty();
+	}
+
+	@JsonIgnore
+	public boolean isSubjectValueValid() {
+		return this.subjectValue == null || !this.subjectValue.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isSubjectLocationValid() {
+		if (this.subjectLocation == null) {
+			return true;
+		} else if (this.subjectLocation.isBlank()) {
+			return false;
+		} else {
+			return LINE_COL_PATT.matcher(this.subjectLocation).find() || XPATH_PATT.matcher(this.subjectLocation).find();
+		}
+	}
+
+	@JsonIgnore
+	public boolean isResultValid() {
+		return this.result != null;
+	}
+
+	@JsonIgnore
+	public boolean isValid() {
+		return this.isDescriptionValid()
+			&& this.isPriorityValid()
+			&& this.isSeverityValid()
+			&& this.isRequirementIDsValid()
+			&& this.isAssertionTypeValid()
+			&& this.isAssertionIDValid()
+			&& this.isSubjectValueValid()
+			&& this.isSubjectLocationValid()
+			&& this.isResultValid();
+	}
+
+	public void computeSeverity() {
+		if (ValidationTestResult.PASSED.equals(this.result)) {
+			this.severity = SeverityLevel.INFO;
+		} else {
+			switch(this.priority) {
+				case MANDATORY:
+					this.severity = SeverityLevel.ERROR;
+					break;
+				case RECOMMENDED:
+					this.severity = SeverityLevel.WARNING;
+					break;
+				default:
+					this.severity = SeverityLevel.INFO;
+			}
+		}
+	}
+
+	static AssertionReport clone(AssertionReport assertionReport) {
+		return assertionReport == null
+			? null
+			: new AssertionReport()
+			.setAssertionID(assertionReport.getAssertionID())
+			.setResult(assertionReport.getResult())
+			.setSeverity(assertionReport.getSeverity())
+			.setPriority(assertionReport.getPriority())
+			.setAssertionType(assertionReport.getAssertionType())
+			.setSubjectLocation(assertionReport.getSubjectLocation())
+			.setRequirementIDs(new String[]{Arrays.toString(assertionReport.getRequirementIDs())})
+			.setUnexpectedErrors(
+				assertionReport.getUnexpectedErrors() != null ? assertionReport.getUnexpectedErrors().stream().map(UnexpectedError::clone).toList() : null
+			);
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/Metadata.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/Metadata.java
new file mode 100644
index 00000000000..64afbe97429
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/Metadata.java
@@ -0,0 +1,53 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public class Metadata {
+	private String name;
+	private String value;
+
+	public Metadata() {
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public Metadata setName(String name) {
+		this.name = name;
+		return this;
+	}
+
+	public String getValue() {
+		return this.value;
+	}
+
+	public Metadata setValue(String value) {
+		this.value = value;
+		return this;
+	}
+
+	@JsonIgnore
+	public boolean isNameValid() {
+		return this.name != null && !this.name.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isValueValid() {
+		return this.value == null || !this.value.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isValid() {
+		return this.isNameValid() && this.isValueValid();
+	}
+
+	static Metadata clone(Metadata metadata) {
+		return metadata == null ? null : new Metadata().setName(metadata.getName()).setValue(metadata.getValue());
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/RequirementPriority.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/RequirementPriority.java
new file mode 100644
index 00000000000..b380a70f2b6
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/RequirementPriority.java
@@ -0,0 +1,12 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public enum RequirementPriority {
+	MANDATORY,
+	RECOMMENDED,
+	PERMITTED;
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/SeverityLevel.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/SeverityLevel.java
new file mode 100644
index 00000000000..7dce7c3f516
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/SeverityLevel.java
@@ -0,0 +1,12 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public enum SeverityLevel {
+	INFO,
+	WARNING,
+	ERROR;
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/UnexpectedError.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/UnexpectedError.java
new file mode 100644
index 00000000000..6610592bdbe
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/UnexpectedError.java
@@ -0,0 +1,74 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public class UnexpectedError {
+	private String name;
+	private String message;
+	private UnexpectedError cause;
+
+	public UnexpectedError() {
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public UnexpectedError setName(String name) {
+		this.name = name;
+		return this;
+	}
+
+	public String getMessage() {
+		return this.message;
+	}
+
+	public UnexpectedError setMessage(String message) {
+		this.message = message;
+		return this;
+	}
+
+	public UnexpectedError getCause() {
+		return this.cause;
+	}
+
+	public UnexpectedError setCause(UnexpectedError cause) {
+		this.cause = cause;
+		return this;
+	}
+
+	@JsonIgnore
+	public boolean isNameValid() {
+		return this.name != null && !this.name.isEmpty();
+	}
+
+	@JsonIgnore
+	public boolean isMessageValid() {
+		return this.message != null && !this.message.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isValid() {
+		return this.isMessageValid() && this.isNameValid();
+	}
+
+	static UnexpectedError clone(UnexpectedError unexpectedError) {
+		if (unexpectedError == null) {
+			return null;
+		} else {
+			UnexpectedError clone = new UnexpectedError();
+			clone.setName(unexpectedError.getName());
+			clone.setMessage(unexpectedError.getMessage());
+			if (unexpectedError.getCause() != null) {
+				clone.setCause(clone(unexpectedError.getCause()));
+			}
+
+			return clone;
+		}
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationCounters.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationCounters.java
new file mode 100644
index 00000000000..dd1c011754a
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationCounters.java
@@ -0,0 +1,167 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.Objects;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public class ValidationCounters {
+	private Integer numberOfAssertions = 0;
+	private Integer numberOfFailedWithInfos = 0;
+	private Integer numberOfFailedWithWarnings = 0;
+	private Integer numberOfFailedWithErrors = 0;
+	private Integer numberOfUnexpectedErrors = 0;
+
+	public ValidationCounters() {
+	}
+
+	public Integer getNumberOfUnexpectedErrors() {
+		return this.numberOfUnexpectedErrors;
+	}
+
+	public ValidationCounters setNumberOfUnexpectedErrors(Integer numberOfUnexpectedErrors) {
+		this.numberOfUnexpectedErrors = numberOfUnexpectedErrors;
+		return this;
+	}
+
+	public Integer getNumberOfAssertions() {
+		return this.numberOfAssertions;
+	}
+
+	public ValidationCounters setNumberOfAssertions(Integer numberOfAssertions) {
+		this.numberOfAssertions = numberOfAssertions;
+		return this;
+	}
+
+	public Integer getNumberOfFailedWithInfos() {
+		return this.numberOfFailedWithInfos;
+	}
+
+	public ValidationCounters setNumberOfFailedWithInfos(Integer numberOfFailedWithInfos) {
+		this.numberOfFailedWithInfos = numberOfFailedWithInfos;
+		return this;
+	}
+
+	public Integer getNumberOfFailedWithWarnings() {
+		return this.numberOfFailedWithWarnings;
+	}
+
+	public ValidationCounters setNumberOfFailedWithWarnings(Integer numberOfFailedWithWarnings) {
+		this.numberOfFailedWithWarnings = numberOfFailedWithWarnings;
+		return this;
+	}
+
+	public Integer getNumberOfFailedWithErrors() {
+		return this.numberOfFailedWithErrors;
+	}
+
+	public ValidationCounters setNumberOfFailedWithErrors(Integer numberOfFailedWithErrors) {
+		this.numberOfFailedWithErrors = numberOfFailedWithErrors;
+		return this;
+	}
+
+	public void incrementNumberOfAssertions() {
+		Integer var1 = this.numberOfAssertions;
+		this.numberOfAssertions = this.numberOfAssertions + 1;
+	}
+
+	public void incrementFailedWithInfos() {
+		Integer var1 = this.numberOfFailedWithInfos;
+		this.numberOfFailedWithInfos = this.numberOfFailedWithInfos + 1;
+	}
+
+	public void incrementFailedWithWarnings() {
+		Integer var1 = this.numberOfFailedWithWarnings;
+		this.numberOfFailedWithWarnings = this.numberOfFailedWithWarnings + 1;
+	}
+
+	public void incrementFailedWithErrors() {
+		Integer var1 = this.numberOfFailedWithErrors;
+		this.numberOfFailedWithErrors = this.numberOfFailedWithErrors + 1;
+	}
+
+	public void incrementUnexpectedErrors() {
+		Integer var1 = this.numberOfUnexpectedErrors;
+		this.numberOfUnexpectedErrors = this.numberOfUnexpectedErrors + 1;
+	}
+
+	public void addNumbersFromSubCounters(ValidationCounters subCounters) {
+		this.numberOfAssertions = this.numberOfAssertions + subCounters.getNumberOfAssertions();
+		this.numberOfFailedWithInfos = this.numberOfFailedWithInfos + subCounters.getNumberOfFailedWithInfos();
+		this.numberOfFailedWithWarnings = this.numberOfFailedWithWarnings + subCounters.getNumberOfFailedWithWarnings();
+		this.numberOfFailedWithErrors = this.numberOfFailedWithErrors + subCounters.getNumberOfFailedWithErrors();
+		this.numberOfUnexpectedErrors = this.numberOfUnexpectedErrors + subCounters.getNumberOfUnexpectedErrors();
+	}
+
+	@JsonIgnore
+	public boolean isNumberOfAssertionsValid() {
+		return this.numberOfAssertions != null && this.numberOfAssertions >= 0;
+	}
+
+	@JsonIgnore
+	public boolean isNumberOfFailedWithInfosValid() {
+		return this.numberOfFailedWithInfos != null && this.numberOfFailedWithInfos >= 0;
+	}
+
+	@JsonIgnore
+	public boolean isNumberOfWarningsValid() {
+		return this.numberOfFailedWithWarnings != null && this.numberOfFailedWithWarnings >= 0;
+	}
+
+	@JsonIgnore
+	public boolean isNumberOfErrorsValid() {
+		return this.numberOfFailedWithErrors != null && this.numberOfFailedWithErrors >= 0;
+	}
+
+	@JsonIgnore
+	public boolean isNumberOfUnexpectedErrorsValid() {
+		return this.numberOfUnexpectedErrors != null && this.numberOfUnexpectedErrors >= 0;
+	}
+
+	@JsonIgnore
+	public boolean isValid() {
+		return this.isNumberOfAssertionsValid()
+			&& this.isNumberOfFailedWithInfosValid()
+			&& this.isNumberOfWarningsValid()
+			&& this.isNumberOfErrorsValid()
+			&& this.isNumberOfUnexpectedErrorsValid();
+	}
+
+	public boolean equals(Object o) {
+		if (this == o) {
+			return true;
+		} else if (!(o instanceof ValidationCounters)) {
+			return false;
+		} else {
+			ValidationCounters that = (ValidationCounters)o;
+			return Objects.equals(this.numberOfAssertions, that.numberOfAssertions)
+				&& Objects.equals(this.numberOfFailedWithInfos, that.numberOfFailedWithInfos)
+				&& Objects.equals(this.numberOfFailedWithWarnings, that.numberOfFailedWithWarnings)
+				&& Objects.equals(this.numberOfFailedWithErrors, that.numberOfFailedWithErrors)
+				&& Objects.equals(this.numberOfUnexpectedErrors, that.numberOfUnexpectedErrors);
+		}
+	}
+
+	public int hashCode() {
+		return Objects.hash(
+			new Object[]{
+				this.numberOfAssertions, this.numberOfFailedWithInfos, this.numberOfFailedWithWarnings, this.numberOfFailedWithErrors, this.numberOfUnexpectedErrors
+			}
+		);
+	}
+
+	static ValidationCounters clone(ValidationCounters validationCounters) {
+		return validationCounters == null
+			? null
+			: new ValidationCounters()
+			.setNumberOfAssertions(validationCounters.getNumberOfAssertions())
+			.setNumberOfFailedWithInfos(validationCounters.getNumberOfFailedWithInfos())
+			.setNumberOfFailedWithWarnings(validationCounters.getNumberOfFailedWithWarnings())
+			.setNumberOfFailedWithErrors(validationCounters.getNumberOfFailedWithErrors())
+			.setNumberOfUnexpectedErrors(validationCounters.getNumberOfUnexpectedErrors());
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationItem.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationItem.java
new file mode 100644
index 00000000000..f3d859cf91f
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationItem.java
@@ -0,0 +1,118 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import java.net.MalformedURLException;
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * The model of a validation item.
+ * <p>
+ * Copy-pasted from
+ * https://gitlab.inria.fr/gazelle/library/validation-service-api/-/blob/master/validation-api/src/main/java/net/ihe/gazelle/validation/api/domain/request/structure/ValidationItem.java?ref_type=heads
+ *
+ * @author Achraf Achkari
+ * @author Quentin Ligier
+ **/
+@JsonRootName(value = "validationItem")
+public class ValidationItem {
+
+	@JsonProperty(value = "itemId")
+	private String itemId;
+
+	@JsonProperty(value = "content")
+	private byte[] content;
+
+	@JsonProperty(value = "role")
+	private String role;
+
+	@JsonProperty(value = "location")
+	private String location;
+
+	public String getItemId() {
+		return itemId;
+	}
+
+	public ValidationItem setItemId(String itemId) {
+		this.itemId = itemId;
+		return this;
+	}
+
+	public byte[] getContent() {
+		return content;
+	}
+
+	public ValidationItem setContent(byte[] content) {
+		this.content = content;
+		return this;
+	}
+
+	public String getRole() {
+		return role;
+	}
+
+	public ValidationItem setRole(String role) {
+		this.role = role;
+		return this;
+	}
+
+	public String getLocation() {
+		return location;
+	}
+
+	public ValidationItem setLocation(String location) {
+		this.location = location;
+		return this;
+	}
+
+	@JsonIgnore
+	public boolean isContentValid() {
+		return content != null && content.length > 0;
+	}
+
+	@JsonIgnore
+	public boolean isItemIdValid() {
+		return itemId == null || !itemId.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isLocationValid(){
+		return location == null || isURLValid(location);
+	}
+
+	@JsonIgnore
+	public boolean isRoleValid(){
+		return role == null || !role.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isRoleDefined(){
+		return role != null && !role.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isURLValid(String url) {
+		try {
+			new URI(url).toURL();
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+
+	@JsonIgnore
+	public boolean isValid(){
+		return isContentValid() && isItemIdValid() && isLocationValid() && isRoleValid();
+	}
+
+	public static ValidationItem clone(ValidationItem validationItem) {
+		return new ValidationItem()
+			.setItemId(validationItem.getItemId())
+			.setContent(validationItem.getContent() != null ? validationItem.getContent().clone():null)
+			.setRole(validationItem.getRole())
+			.setLocation(validationItem.getLocation());
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationMethod.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationMethod.java
new file mode 100644
index 00000000000..bba8a9f5d2b
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationMethod.java
@@ -0,0 +1,92 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public class ValidationMethod {
+	private String validationServiceName;
+	private String validationServiceVersion;
+	private String validationProfileID;
+	private String validationProfileVersion;
+
+	public ValidationMethod() {
+	}
+
+	public String getValidationServiceName() {
+		return this.validationServiceName;
+	}
+
+	public ValidationMethod setValidationServiceName(String validationServiceName) {
+		this.validationServiceName = validationServiceName;
+		return this;
+	}
+
+	public String getValidationServiceVersion() {
+		return this.validationServiceVersion;
+	}
+
+	public ValidationMethod setValidationServiceVersion(String validationServiceVersion) {
+		this.validationServiceVersion = validationServiceVersion;
+		return this;
+	}
+
+	public String getValidationProfileID() {
+		return this.validationProfileID;
+	}
+
+	public ValidationMethod setValidationProfileID(String validationProfileID) {
+		this.validationProfileID = validationProfileID;
+		return this;
+	}
+
+	public String getValidationProfileVersion() {
+		return this.validationProfileVersion;
+	}
+
+	public ValidationMethod setValidationProfileVersion(String validationProfileVersion) {
+		this.validationProfileVersion = validationProfileVersion;
+		return this;
+	}
+
+	@JsonIgnore
+	public boolean isValidationServiceNameValid() {
+		return this.validationServiceName != null && !this.validationServiceName.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isValidationServiceVersionValid() {
+		return this.validationServiceVersion != null && !this.validationServiceVersion.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isValidationProfileIDValid() {
+		return this.validationProfileID != null && !this.validationProfileID.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isValidationProfileVersionValid() {
+		return this.validationProfileVersion != null && !this.validationProfileVersion.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isValid() {
+		return this.isValidationServiceNameValid()
+			&& this.isValidationServiceVersionValid()
+			&& this.isValidationProfileIDValid()
+			&& this.isValidationProfileVersionValid();
+	}
+
+	static ValidationMethod clone(ValidationMethod validationMethod) {
+		return validationMethod == null
+			? null
+			: new ValidationMethod()
+			.setValidationServiceName(validationMethod.getValidationServiceName())
+			.setValidationServiceVersion(validationMethod.getValidationServiceVersion())
+			.setValidationProfileID(validationMethod.getValidationProfileID())
+			.setValidationProfileVersion(validationMethod.getValidationProfileVersion());
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationProfile.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationProfile.java
new file mode 100644
index 00000000000..620ea6fef30
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationProfile.java
@@ -0,0 +1,105 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonPropertyOrder;
+import com.fasterxml.jackson.annotation.JsonTypeName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+@JsonTypeName("validationProfile")
+@JsonPropertyOrder({"profileID", "profileName", "domain", "coveredItems"})
+public class ValidationProfile {
+
+	@JsonProperty("profileID")
+	private String profileID;
+
+	@JsonProperty("profileName")
+	private String profileName;
+
+	// Not really useful for FHIR transactions
+	@JsonProperty("coveredItems")
+	private List<String> coveredItems = new ArrayList<>();
+
+	// E.g. "IHE", "ITI", "EPR".
+	@JsonProperty("domain")
+	private String domain;
+
+	public String getDomain() {
+		return this.domain;
+	}
+
+	public ValidationProfile setDomain(String domain) {
+		this.domain = domain;
+		return this;
+	}
+
+	public String getProfileName() {
+		return this.profileName;
+	}
+
+	public ValidationProfile setProfileName(String profileName) {
+		this.profileName = profileName;
+		return this;
+	}
+
+	public String getProfileID() {
+		return this.profileID;
+	}
+
+	public ValidationProfile setProfileID(String profileID) {
+		this.profileID = profileID;
+		return this;
+	}
+
+	public List<String> getCoveredItems() {
+		return this.coveredItems;
+	}
+
+	public ValidationProfile setCoveredItems(List<String> coveredItems) {
+		this.coveredItems = coveredItems;
+		return this;
+	}
+
+	public ValidationProfile addCoveredItem(String item) {
+		this.coveredItems.add(item);
+		return this;
+	}
+
+	@JsonIgnore
+	public boolean isProfileNameValid() {
+		return this.profileName == null || !this.profileName.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isProfileIDValid() {
+		return this.profileID != null && !this.profileID.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isCoveredItemsValid() {
+		for(String item : this.coveredItems) {
+			if (item == null || item.isBlank()) {
+				return false;
+			}
+		}
+
+		return true;
+	}
+
+	@JsonIgnore
+	public boolean isDomainValid() {
+		return this.domain != null && !this.domain.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isValid() {
+		return this.isProfileIDValid() && this.isProfileNameValid() && this.isCoveredItemsValid() && this.isDomainValid();
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationReport.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationReport.java
new file mode 100644
index 00000000000..ec849d4ede1
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationReport.java
@@ -0,0 +1,253 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.*;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public class ValidationReport {
+	private String modelVersion = "0.1";
+	private String uuid;
+	private Date dateTime;
+	private String disclaimer;
+	private ValidationMethod validationMethod;
+	private ValidationTestResult overallResult = ValidationTestResult.UNDEFINED;
+	private List<Metadata> additionalMetadata;
+	private List<ValidationSubReport> reports;
+	private List<ValidationItem> validationItems;
+	private ValidationCounters counters = new ValidationCounters();
+
+	public ValidationReport() {
+		this.validationMethod = new ValidationMethod();
+		this.dateTime = new Date();
+		this.uuid = UUID.randomUUID().toString();
+	}
+
+	public String getUuid() {
+		return this.uuid;
+	}
+
+	public ValidationReport setUuid(String uuid) {
+		this.uuid = uuid;
+		return this;
+	}
+
+	public String getModelVersion() {
+		return this.modelVersion;
+	}
+
+	public ValidationReport setModelVersion(String modelVersion) {
+		this.modelVersion = modelVersion;
+		return this;
+	}
+
+	public Date getDateTime() {
+		return this.dateTime;
+	}
+
+	public ValidationReport setDateTime(Date dateTime) {
+		this.dateTime = dateTime;
+		return this;
+	}
+
+	public String getDisclaimer() {
+		return this.disclaimer;
+	}
+
+	public ValidationReport setDisclaimer(String disclaimer) {
+		this.disclaimer = disclaimer;
+		return this;
+	}
+
+	public ValidationMethod getValidationMethod() {
+		return this.validationMethod;
+	}
+
+	public ValidationReport setValidationMethod(ValidationMethod validationMethod) {
+		this.validationMethod = validationMethod;
+		return this;
+	}
+
+	public ValidationCounters getCounters() {
+		return this.counters;
+	}
+
+	public ValidationReport setCounters(ValidationCounters counters) {
+		this.counters = counters;
+		return this;
+	}
+
+	public ValidationTestResult getOverallResult() {
+		return this.overallResult;
+	}
+
+	public ValidationReport setOverallResult(ValidationTestResult overallResult) {
+		this.overallResult = overallResult;
+		return this;
+	}
+
+	public List<ValidationSubReport> getReports() {
+		return this.reports;
+	}
+
+	public ValidationReport setReports(List<ValidationSubReport> reports) {
+		this.reports = reports;
+		return this;
+	}
+
+	public List<Metadata> getAdditionalMetadata() {
+		return this.additionalMetadata;
+	}
+
+	public ValidationReport setAdditionalMetadata(List<Metadata> additionalMetadata) {
+		this.additionalMetadata = additionalMetadata;
+		return this;
+	}
+
+	public ValidationReport addAdditionalMetadata(Metadata metadata) {
+		if (this.additionalMetadata == null) {
+			this.additionalMetadata = new ArrayList();
+		}
+
+		this.additionalMetadata.add(metadata);
+		return this;
+	}
+
+	public ValidationReport addValidationItem(ValidationItem validationItem) {
+		if (this.validationItems == null) {
+			this.validationItems = new ArrayList();
+		}
+
+		this.validationItems.add(validationItem);
+		return this;
+	}
+
+	public ValidationReport addValidationSubReport(ValidationSubReport validationSubReport) {
+		if (this.reports == null) {
+			this.reports = new ArrayList();
+		}
+
+		this.reports.add(validationSubReport);
+		return this;
+	}
+
+	public List<ValidationItem> getValidationItems() {
+		return this.validationItems;
+	}
+
+	public ValidationReport setValidationItems(List<ValidationItem> validationItems) {
+		this.validationItems = validationItems;
+		return this;
+	}
+
+	public void computeCounters() {
+		if (this.reports != null) {
+			for(ValidationSubReport report : this.reports) {
+				this.counters.setNumberOfAssertions(this.counters.getNumberOfAssertions() + report.getSubCounters().getNumberOfAssertions());
+				this.counters.setNumberOfFailedWithInfos(this.counters.getNumberOfFailedWithInfos() + report.getSubCounters().getNumberOfFailedWithInfos());
+				this.counters.setNumberOfFailedWithWarnings(this.counters.getNumberOfFailedWithWarnings() + report.getSubCounters().getNumberOfFailedWithWarnings());
+				this.counters.setNumberOfFailedWithErrors(this.counters.getNumberOfFailedWithErrors() + report.getSubCounters().getNumberOfFailedWithErrors());
+				this.counters.setNumberOfUnexpectedErrors(this.counters.getNumberOfUnexpectedErrors() + report.getSubCounters().getNumberOfUnexpectedErrors());
+			}
+		}
+	}
+
+	public void computeOverallResult() {
+		this.overallResult = this.reports != null
+			? (ValidationTestResult)this.reports
+			.stream()
+			.map(ValidationSubReport::getSubReportResult)
+			.filter(Objects::nonNull)
+			.max(ValidationSubReport::keepHeaviestResult)
+			.orElse(ValidationTestResult.UNDEFINED)
+			: ValidationTestResult.UNDEFINED;
+	}
+
+	@JsonIgnore
+	public boolean isDateTimeValid() {
+		return this.dateTime != null;
+	}
+
+	@JsonIgnore
+	public boolean isDisclaimerValid() {
+		return this.disclaimer != null && !this.disclaimer.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isValidationMethodValid() {
+		return this.validationMethod != null;
+	}
+
+	@JsonIgnore
+	public boolean isValidationCountersValid() {
+		ValidationReport validationReport = clone(this);
+		return validationReport.getCounters().equals(this.counters);
+	}
+	@JsonIgnore
+
+	public boolean isValidationTestResultValid() {
+		return this.overallResult != null;
+	}
+
+	@JsonIgnore
+	public boolean isModelVersionValid() {
+		return this.modelVersion == null || !this.modelVersion.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isReportsValid() {
+		return this.reports == null || !this.reports.isEmpty();
+	}
+
+	@JsonIgnore
+	public boolean isAdditionalMetadataValid() {
+		return this.additionalMetadata == null || !this.additionalMetadata.isEmpty();
+	}
+
+	@JsonIgnore
+	public boolean isValidationItemsValid() {
+		return this.validationItems == null || !this.validationItems.isEmpty();
+	}
+
+	@JsonIgnore
+	public boolean isUuidValid() {
+		return this.uuid != null && !this.uuid.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isValid() {
+		return this.isDateTimeValid()
+			&& this.isDisclaimerValid()
+			&& this.isValidationMethodValid()
+			&& this.isValidationCountersValid()
+			&& this.isValidationTestResultValid()
+			&& this.isReportsValid()
+			&& this.isAdditionalMetadataValid()
+			&& this.isValidationItemsValid()
+			&& this.isUuidValid();
+	}
+
+	static ValidationReport clone(ValidationReport validationReport) {
+		return validationReport == null
+			? null
+			: new ValidationReport()
+			.setDisclaimer(validationReport.getDisclaimer())
+			.setDateTime(validationReport.getDateTime())
+			.setModelVersion(validationReport.getModelVersion())
+			.setUuid(validationReport.getUuid())
+			.setValidationMethod(ValidationMethod.clone(validationReport.getValidationMethod()))
+			.setValidationItems(
+				validationReport.getValidationItems() != null ? validationReport.getValidationItems().stream().map(ValidationItem::clone).toList() : null
+			)
+			.setReports(validationReport.getReports() != null ? validationReport.getReports().stream().map(ValidationSubReport::clone).toList() : null)
+			.setAdditionalMetadata(
+				validationReport.getAdditionalMetadata() != null ? validationReport.getAdditionalMetadata().stream().map(Metadata::clone).toList() : null
+			)
+			.setCounters(ValidationCounters.clone(validationReport.getCounters()))
+			.setOverallResult(validationReport.getOverallResult());
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationRequest.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationRequest.java
new file mode 100644
index 00000000000..8529da432a3
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationRequest.java
@@ -0,0 +1,97 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+import com.fasterxml.jackson.annotation.JsonRootName;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * The model of a validation request, containing a list of items to validate.
+ * <p>
+ * Copy-pasted from
+ * https://gitlab.inria.fr/gazelle/library/validation-service-api/-/blob/master/validation-api/src/main/java/net/ihe/gazelle/validation/api/domain/request/structure/ValidationRequest.java?ref_type=heads
+ *
+ * @author Achraf Achkari
+ * @author Quentin Ligier
+ **/
+@JsonRootName(value = "validationRequest")
+public class ValidationRequest {
+	public static final String API_VERSION = "0.1";
+
+	@JsonProperty(value = "apiVersion")
+	private String apiVersion = API_VERSION;
+
+	@JsonProperty(value = "validationServiceName")
+	private String validationServiceName; // given In URL
+
+	@JsonProperty(value = "validationProfileId")
+	private String validationProfileId;
+
+	@JsonProperty(value = "validationItems")
+	private List<ValidationItem> validationItems;
+
+	public String getApiVersion() {
+		return apiVersion;
+	}
+
+	public ValidationRequest setApiVersion(String apiVersion) {
+		this.apiVersion = apiVersion;
+		return this;
+	}
+
+	public String getValidationServiceName() {
+		return validationServiceName;
+	}
+
+	public ValidationRequest setValidationServiceName(String validationServiceName) {
+		this.validationServiceName = validationServiceName;
+		return this;
+	}
+
+	public String getValidationProfileId() {
+		return validationProfileId;
+	}
+
+	public ValidationRequest setValidationProfileId(String validationProfileId) {
+		this.validationProfileId = validationProfileId;
+		return this;
+	}
+
+	public List<ValidationItem> getValidationItems() {
+		return validationItems;
+	}
+
+	public ValidationRequest setValidationItems(List<ValidationItem> validationItems) {
+		this.validationItems = validationItems;
+		return this;
+	}
+	public ValidationRequest addValidationItem(ValidationItem validationItem){
+		if(this.validationItems == null){
+			this.validationItems = new ArrayList<>();
+		}
+		this.validationItems.add(validationItem);
+		return this;
+	}
+
+	public boolean isValidationProfileIdValid(){
+		return validationProfileId != null && !validationProfileId.isBlank();
+	}
+
+	public boolean isValidationServiceNameValid(){
+		return validationServiceName != null && !validationServiceName.isBlank();
+	}
+
+	public boolean isValidationItemsValid(){
+		return validationItems != null && !validationItems.isEmpty();
+	}
+
+	public boolean isValidationItemsRolesValid(){
+		return validationItems == null || validationItems.size()<2
+			|| validationItems.stream().allMatch(item ->item.getRole() !=null && !item.getRole().isBlank());
+	}
+
+	public boolean isValid(){
+		return isValidationItemsValid() && isValidationProfileIdValid() && isValidationServiceNameValid();
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationSubReport.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationSubReport.java
new file mode 100644
index 00000000000..70a073010c7
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationSubReport.java
@@ -0,0 +1,267 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+import ch.ahdis.matchbox.gazelle.utils.BidMap;
+import com.fasterxml.jackson.annotation.JsonIgnore;
+
+import java.util.ArrayList;
+import java.util.List;
+import java.util.Objects;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public class ValidationSubReport {
+	private String name;
+	private String[] standards;
+	private ValidationTestResult subReportResult = ValidationTestResult.UNDEFINED;
+	private List<ValidationSubReport> subReports;
+	private List<AssertionReport> assertionReports;
+	private ValidationCounters subCounters = new ValidationCounters();
+	private List<UnexpectedError> unexpectedErrors;
+	private static final BidMap<ValidationTestResult, Integer> validationTestResultWeights = BidMap.of(
+            new BidMap.Entry(ValidationTestResult.PASSED, 0),
+				new BidMap.Entry(ValidationTestResult.FAILED, 1),
+				new BidMap.Entry(ValidationTestResult.UNDEFINED, 2));
+
+	public ValidationSubReport() {
+	}
+
+	public String getName() {
+		return this.name;
+	}
+
+	public ValidationSubReport setName(String name) {
+		this.name = name;
+		return this;
+	}
+
+	public String[] getStandards() {
+		return this.standards;
+	}
+
+	public ValidationSubReport setStandards(String[] standards) {
+		this.standards = standards;
+		return this;
+	}
+
+	public ValidationTestResult getSubReportResult() {
+		return this.subReportResult;
+	}
+
+	public ValidationSubReport setSubReportResult(ValidationTestResult subReportResult) {
+		this.subReportResult = subReportResult;
+		return this;
+	}
+
+	public List<ValidationSubReport> getSubReports() {
+		return this.subReports;
+	}
+
+	public ValidationSubReport setSubReports(List<ValidationSubReport> subReports) {
+		this.subReports = subReports;
+		return this;
+	}
+
+	public List<UnexpectedError> getUnexpectedErrors() {
+		return this.unexpectedErrors;
+	}
+
+	public ValidationSubReport setUnexpectedErrors(List<UnexpectedError> unexpectedErrors) {
+		this.unexpectedErrors = unexpectedErrors;
+		return this;
+	}
+
+	public List<AssertionReport> getAssertionReports() {
+		return this.assertionReports;
+	}
+
+	public ValidationSubReport setAssertionReports(List<AssertionReport> assertionReports) {
+		this.assertionReports = assertionReports;
+		return this;
+	}
+
+	public ValidationCounters getSubCounters() {
+		return this.subCounters;
+	}
+
+	public ValidationSubReport setSubCounters(ValidationCounters subCounters) {
+		this.subCounters = subCounters;
+		return this;
+	}
+
+	public ValidationSubReport addSubReport(ValidationSubReport subReport) {
+		if (this.subReports == null) {
+			this.subReports = new ArrayList<>();
+		}
+
+		this.subReports.add(subReport);
+		return this;
+	}
+
+	public ValidationSubReport addAssertionReport(AssertionReport assertionReport) {
+		if (this.assertionReports == null) {
+			this.assertionReports = new ArrayList<>();
+		}
+
+		this.assertionReports.add(assertionReport);
+		return this;
+	}
+
+	public ValidationSubReport addUnexpectedError(UnexpectedError unexpectedError) {
+		if (this.unexpectedErrors == null) {
+			this.unexpectedErrors = new ArrayList<>();
+		}
+
+		this.unexpectedErrors.add(unexpectedError);
+		return this;
+	}
+
+	@JsonIgnore
+	public boolean isNameValid() {
+		return this.name != null && !this.name.isBlank();
+	}
+
+	@JsonIgnore
+	public boolean isSubReportResultValid() {
+		return this.subReportResult != null;
+	}
+
+	@JsonIgnore
+	public boolean isUnexpectedErrorsValid() {
+		return this.unexpectedErrors == null || !this.unexpectedErrors.isEmpty();
+	}
+
+	@JsonIgnore
+	public boolean isAssertionReportsValid() {
+		return this.assertionReports == null || !this.assertionReports.isEmpty();
+	}
+
+	@JsonIgnore
+	public boolean isStandardsValid() {
+		return this.standards == null || this.standards.length > 0;
+	}
+
+	@JsonIgnore
+	public boolean isSubCounterValid() {
+		ValidationSubReport temp = clone(this);
+		return this.subCounters != null && this.subCounters.equals(temp.getSubCounters());
+	}
+
+	@JsonIgnore
+	public boolean isSubReportsValid() {
+		return this.subReports == null || !this.subReports.isEmpty();
+	}
+
+	@JsonIgnore
+	public boolean isValid() {
+		return this.isNameValid()
+			&& this.isSubReportResultValid()
+			&& this.isUnexpectedErrorsValid()
+			&& this.isAssertionReportsValid()
+			&& this.isSubReportsValid()
+			&& this.isStandardsValid()
+			&& this.isSubCounterValid();
+	}
+
+	public void computeResultSubReport() {
+		ValidationTestResult assertionsResult = this.assertionReports != null
+			? (ValidationTestResult)this.assertionReports
+			.stream()
+			.map(this::getAssertionResultBySeverity)
+			.filter(Objects::nonNull)
+			.max(ValidationSubReport::keepHeaviestResult)
+			.orElse(ValidationTestResult.UNDEFINED)
+			: ValidationTestResult.UNDEFINED;
+		ValidationTestResult subReportsResult = this.subReports != null
+			? (ValidationTestResult)this.subReports
+			.stream()
+			.map(ValidationSubReport::getSubReportResult)
+			.filter(Objects::nonNull)
+			.max(ValidationSubReport::keepHeaviestResult)
+			.orElse(assertionsResult)
+			: assertionsResult;
+		this.subReportResult = this.getHeaviestResult(assertionsResult, subReportsResult);
+	}
+
+	static int keepHeaviestResult(ValidationTestResult result1, ValidationTestResult result2) {
+		return validationTestResultWeights.get(result1) - validationTestResultWeights.get(result2);
+	}
+
+	private ValidationTestResult getHeaviestResult(ValidationTestResult result1, ValidationTestResult result2) {
+		return keepHeaviestResult(result1, result2) > 0 ? result1 : result2;
+	}
+
+	private ValidationTestResult getAssertionResultBySeverity(AssertionReport assertionReport) {
+		return assertionReport.getResult() == ValidationTestResult.FAILED && assertionReport.getSeverity() != SeverityLevel.ERROR
+			? ValidationTestResult.PASSED
+			: assertionReport.getResult();
+	}
+
+	public void computeCountersSubReport() {
+		this.computeCountersFromAssertionReports();
+		this.computeCountersFromSubReports();
+	}
+
+	private void computeCountersFromAssertionReports() {
+		if (this.getAssertionReports() != null) {
+			this.getAssertionReports().forEach(this::processAssertionReport);
+		}
+	}
+
+	private void processAssertionReport(AssertionReport assertionReport) {
+		this.getSubCounters().incrementNumberOfAssertions();
+		if (assertionReport.getResult() == ValidationTestResult.FAILED) {
+			this.processFailedAssertionReport(assertionReport);
+		} else if (assertionReport.getResult() == ValidationTestResult.UNDEFINED && assertionReport.getSeverity() == SeverityLevel.ERROR) {
+			this.getSubCounters().incrementUnexpectedErrors();
+		}
+	}
+
+	private void processFailedAssertionReport(AssertionReport assertionReport) {
+		if (assertionReport.getSeverity() == SeverityLevel.ERROR) {
+			this.getSubCounters().incrementFailedWithErrors();
+		} else if (assertionReport.getSeverity() == SeverityLevel.WARNING) {
+			this.getSubCounters().incrementFailedWithWarnings();
+		} else {
+			this.getSubCounters().incrementFailedWithInfos();
+		}
+	}
+
+	private void computeCountersFromSubReports() {
+		if (this.getSubReports() != null) {
+			this.getSubReports().forEach(subReport -> {
+				subReport.computeCountersSubReport();
+				this.getSubCounters().addNumbersFromSubCounters(subReport.getSubCounters());
+			});
+		}
+	}
+
+	static ValidationSubReport clone(ValidationSubReport validationSubReport) {
+		if (validationSubReport == null) {
+			return null;
+		} else {
+			String[] standardsClone;
+			if (validationSubReport.getStandards() == null) {
+				standardsClone = null;
+			} else {
+				standardsClone = new String[validationSubReport.getStandards().length];
+				System.arraycopy(validationSubReport.getStandards(), 0, standardsClone, 0, standardsClone.length);
+			}
+
+			return new ValidationSubReport()
+				.setName(validationSubReport.getName())
+				.setStandards(standardsClone)
+				.setSubReportResult(validationSubReport.getSubReportResult())
+				.setSubCounters(ValidationCounters.clone(validationSubReport.getSubCounters()))
+				.setSubReports(validationSubReport.getSubReports() != null ? validationSubReport.getSubReports().stream().map(v -> clone(v)).toList() : null)
+				.setAssertionReports(
+					validationSubReport.getAssertionReports() != null ? validationSubReport.getAssertionReports().stream().map(AssertionReport::clone).toList() : null
+				)
+				.setUnexpectedErrors(
+					validationSubReport.getUnexpectedErrors() != null ? validationSubReport.getUnexpectedErrors().stream().map(UnexpectedError::clone).toList() : null
+				);
+		}
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationTestResult.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationTestResult.java
new file mode 100644
index 00000000000..574bc8ed7bb
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/models/validation/ValidationTestResult.java
@@ -0,0 +1,12 @@
+package ch.ahdis.matchbox.gazelle.models.validation;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public enum ValidationTestResult {
+	PASSED,
+	FAILED,
+	UNDEFINED;
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/utils/BidMap.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/utils/BidMap.java
new file mode 100644
index 00000000000..238fe674959
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/gazelle/utils/BidMap.java
@@ -0,0 +1,94 @@
+package ch.ahdis.matchbox.gazelle.utils;
+
+import java.io.Serial;
+import java.util.HashMap;
+import java.util.Map;
+
+/**
+ * matchbox
+ *
+ * @author Quentin Ligier
+ **/
+public class BidMap<K, V> extends HashMap<K, V> {
+	@Serial
+	private static final long serialVersionUID = 5425067725254365745L;
+	private final Map<V, K> reversedMap = new HashMap<>();
+
+	public BidMap() {
+	}
+
+	public K getKey(V value) {
+		return this.reversedMap.get(value);
+	}
+
+	public boolean isEmpty() {
+		return this.size() == 0;
+	}
+
+	public V remove(Object key) {
+		V val = super.remove(key);
+		this.reversedMap.remove(val);
+		return val;
+	}
+
+	public K removeKey(V value) {
+		K val = this.reversedMap.remove(value);
+		super.remove(val);
+		return val;
+	}
+
+	public V put(K key, V value) {
+		if (this.reversedMap.containsKey(value)) {
+			super.remove(this.reversedMap.get(value));
+		}
+
+		if (super.containsKey(key)) {
+			this.reversedMap.remove(super.get(key));
+		}
+
+		this.reversedMap.put(value, key);
+		return super.put(key, value);
+	}
+
+	@SafeVarargs
+	public static <K, V> BidMap<K, V> of(BidMap.Entry<K, V>... entries) {
+		BidMap<K, V> result = new BidMap<>();
+
+		for(BidMap.Entry<K, V> entry : entries) {
+			result.put(entry.key, entry.value);
+		}
+
+		return result;
+	}
+
+	public static class Entry<K, V> {
+		private K key;
+		private V value;
+
+		public Entry() {
+		}
+
+		public Entry(K key, V value) {
+			this.key = key;
+			this.value = value;
+		}
+
+		public K getKey() {
+			return this.key;
+		}
+
+		public BidMap.Entry<K, V> setKey(K key) {
+			this.key = key;
+			return this;
+		}
+
+		public V getValue() {
+			return this.value;
+		}
+
+		public BidMap.Entry<K, V> setValue(V value) {
+			this.value = value;
+			return this;
+		}
+	}
+}
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/util/MatchboxPackageInstallerImpl.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/util/MatchboxPackageInstallerImpl.java
index f7c2010e359..7aff501b101 100644
--- a/matchbox-server/src/main/java/ch/ahdis/matchbox/util/MatchboxPackageInstallerImpl.java
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/util/MatchboxPackageInstallerImpl.java
@@ -4,18 +4,22 @@
 import static org.apache.commons.lang3.StringUtils.isBlank;
 
 import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.List;
-import java.util.Optional;
-
+import java.nio.charset.StandardCharsets;
+import java.util.*;
+
+import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc;
+import ca.uhn.fhir.jpa.dao.data.INpmPackageVersionResourceDao;
+import ca.uhn.fhir.jpa.model.dao.JpaPid;
+import ca.uhn.fhir.util.BinaryUtil;
+import ch.ahdis.matchbox.StructureDefinitionResourceProvider;
 import jakarta.annotation.PostConstruct;
 
-import org.hl7.fhir.instance.model.api.IBase;
-import org.hl7.fhir.instance.model.api.IBaseResource;
-import org.hl7.fhir.instance.model.api.IIdType;
-import org.hl7.fhir.instance.model.api.IPrimitiveType;
+import org.hl7.fhir.convertors.factory.VersionConvertorFactory_30_50;
+import org.hl7.fhir.convertors.factory.VersionConvertorFactory_40_50;
+import org.hl7.fhir.convertors.factory.VersionConvertorFactory_43_50;
+import org.hl7.fhir.instance.model.api.*;
 import org.hl7.fhir.r4.model.Identifier;
+import org.hl7.fhir.r4.model.StructureDefinition;
 import org.hl7.fhir.utilities.json.model.JsonObject;
 import org.hl7.fhir.utilities.npm.IPackageCacheManager;
 import org.hl7.fhir.utilities.npm.NpmPackage;
@@ -23,6 +27,7 @@
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.data.domain.PageRequest;
 import org.springframework.transaction.PlatformTransactionManager;
 import org.springframework.transaction.support.TransactionTemplate;
 
@@ -64,7 +69,7 @@
  * following modifications: - Resources with status "draft" are also loaded -
  * examples are also loaded Modifications are marked in source code comments
  * with "MODIFIED"
- * 
+ *
  * @author alexander kreutz
  *
  */
@@ -89,7 +94,11 @@ public class MatchboxPackageInstallerImpl implements IPackageInstallerSvc {
 	@Autowired
 	private INpmPackageVersionDao myPackageVersionDao;
 	@Autowired
+	private INpmPackageVersionResourceDao myPackageVersionResourceDao;
+	@Autowired
 	private PartitionSettings myPartitionSettings;
+	@Autowired
+	private IBinaryStorageSvc myBinaryStorageSvc;
 
 	/**
 	 * Constructor
@@ -149,14 +158,14 @@ public PackageDeleteOutcomeJson uninstall(PackageInstallationSpec theInstallatio
 	@SuppressWarnings("ConstantConditions")
 	public PackageInstallOutcomeJson install(PackageInstallationSpec theInstallationSpec)
 			throws ImplementationGuideInstallationException {
-		
+
 		// FIXME. Don't add hl7.terminology.r5
-		
+
 		theInstallationSpec.addDependencyExclude("hl7.terminology.r4");
 		theInstallationSpec.addDependencyExclude("hl7.terminology.r5");
 		theInstallationSpec.addDependencyExclude("hl7.fhir.cda");  // used as dev
-		
-		
+
+
 		PackageInstallOutcomeJson retVal = new PackageInstallOutcomeJson();
 		if (enabled) {
 			try {
@@ -191,21 +200,71 @@ public PackageInstallOutcomeJson install(PackageInstallationSpec theInstallation
 					throw new IOException("Package not found");
 				}
 				retVal.getMessage().addAll(JpaPackageCache.getProcessingMessages(npmPackage));
-				
+
 //				if (theInstallationSpec.isFetchDependencies()) {
 					fetchAndInstallDependencies(npmPackage, theInstallationSpec, retVal);
 //				}
 
-				
+
 			} catch (IOException e) {
 				throw new ImplementationGuideInstallationException(
 						"Could not load NPM package " + theInstallationSpec.getName() + "#" + theInstallationSpec.getVersion(), e);
 			}
+
+			// We have installed at least one new package, let's save the StructureDefinition titles in the database
+			ourLog.debug("Updating StructureDefinition titles...");
+			final var parserR4 = new org.hl7.fhir.r4.formats.JsonParser();
+			final var parserR5 = new org.hl7.fhir.r5.formats.JsonParser();
+			new TransactionTemplate(this.myTxManager).execute(tx -> {
+				final var page = PageRequest.of(0, 2147483646);
+				this.myPackageVersionResourceDao.findByResourceType(page, "StructureDefinition")
+					.forEach(npmPackageVersionResourceEntity -> {
+						try {
+							if (npmPackageVersionResourceEntity.getFilename() != null && !npmPackageVersionResourceEntity.getFilename().endsWith(".json")) {
+								// The filename has already been modified
+								return;
+							}
+							final var sdBinary = MatchboxServerUtils.getBinaryFromId(npmPackageVersionResourceEntity.getResourceBinary().getId(), myDaoRegistry);
+							final byte[] resourceContentsBytes;
+							resourceContentsBytes = MatchboxServerUtils.fetchBlobFromBinary(sdBinary, myBinaryStorageSvc,
+																												 myFhirContext);
+							final String resourceContents = new String(resourceContentsBytes, StandardCharsets.UTF_8);
+							final var title = switch (npmPackageVersionResourceEntity.getFhirVersion()) {
+								case R4 -> {
+									final var sd = (org.hl7.fhir.r4.model.StructureDefinition) parserR4.parse(resourceContents);
+									if (sd.getTitle() != null) {
+										yield sd.getTitle();
+									}
+									yield sd.getName();
+								}
+								case R5 -> {
+									final var sd = (org.hl7.fhir.r5.model.StructureDefinition) parserR5.parse(resourceContents);
+									if (sd.getTitle() != null) {
+										yield sd.getTitle();
+									}
+									yield sd.getName();
+								}
+								default -> {
+									ourLog.error("FHIR version not supported for parsing the StructureDefinition");
+									throw new RuntimeException(Msg.code(1305) + "Failed to load package resource " + resourceContents);
+								}
+							};
+
+							// Change the filename for the StructureDefinition title
+							npmPackageVersionResourceEntity.setFilename(title);
+							this.myPackageVersionResourceDao.save(npmPackageVersionResourceEntity);
+						} catch (final IOException e) {
+							ourLog.error("Unable to extract the StructureDefinition title", e);
+						}
+				});
+				return null;
+			});
+			ourLog.debug("Updating StructureDefinition titles... Done");
 		}
 
 		return retVal;
 	}
-	
+
 	private void fetchAndInstallDependencies(NpmPackage npmPackage, PackageInstallationSpec theInstallationSpec, PackageInstallOutcomeJson theOutcome) throws ImplementationGuideInstallationException {
 		if (npmPackage.getNpm().has("dependencies")) {
 			JsonObject dependencies = npmPackage.getNpm().get("dependencies").asJsonObject();
@@ -250,15 +309,15 @@ private List<IBaseResource> parseResourcesOfType(String type, NpmPackage pkg) {
 		if (!pkg.getFolders().containsKey("package")) {
 			return Collections.emptyList();
 		}
-					
+
 		ArrayList<IBaseResource> resources = new ArrayList<>();
-		
+
 		addFolder(type, pkg.getFolders().get("package"), resources);
-		
+
 		NpmPackageFolder exampleFolder = pkg.getFolders().get("example");
-		if (exampleFolder != null) {			
+		if (exampleFolder != null) {
 			try {
-			  pkg.indexFolder("example", exampleFolder);			  
+			  pkg.indexFolder("example", exampleFolder);
 			  addFolder(type, exampleFolder, resources);
 			} catch (IOException e) {
 				throw new InternalErrorException("Cannot install resource of type " + type + ": Could not read example directory", e);
diff --git a/matchbox-server/src/main/java/ch/ahdis/matchbox/util/MatchboxServerUtils.java b/matchbox-server/src/main/java/ch/ahdis/matchbox/util/MatchboxServerUtils.java
new file mode 100644
index 00000000000..1ffe8acee4a
--- /dev/null
+++ b/matchbox-server/src/main/java/ch/ahdis/matchbox/util/MatchboxServerUtils.java
@@ -0,0 +1,65 @@
+package ch.ahdis.matchbox.util;
+
+import ca.uhn.fhir.context.FhirContext;
+import ca.uhn.fhir.i18n.Msg;
+import ca.uhn.fhir.jpa.api.dao.DaoRegistry;
+import ca.uhn.fhir.jpa.binary.api.IBinaryStorageSvc;
+import ca.uhn.fhir.jpa.binary.svc.NullBinaryStorageSvcImpl;
+import ca.uhn.fhir.jpa.model.dao.JpaPid;
+import ca.uhn.fhir.rest.server.exceptions.InternalErrorException;
+import ca.uhn.fhir.util.BinaryUtil;
+import org.checkerframework.checker.nullness.qual.Nullable;
+import org.hl7.fhir.instance.model.api.IBaseBinary;
+
+import java.io.IOException;
+
+/**
+ * A utility class for Matchbox Server.
+ *
+ * @author Quentin Ligier
+ **/
+public class MatchboxServerUtils {
+
+	/**
+	 * This class is not instantiable.
+	 */
+	private MatchboxServerUtils() {
+	}
+
+	/**
+	 * Helper method to retrieve a Binary from its ID.
+	 *
+	 * @param binaryId 		the ID of the Binary
+	 * @param myDaoRegistry the DAO registry
+	 * @return the Binary
+	 */
+	public static IBaseBinary getBinaryFromId(final long binaryId,
+													      final DaoRegistry myDaoRegistry) {
+		return (IBaseBinary) myDaoRegistry.getResourceDao("Binary").readByPid(JpaPid.fromId(binaryId));
+	}
+
+	/**
+	 * Helper method which will attempt to use the IBinaryStorageSvc to resolve the binary blob if available. If the bean
+	 * is unavailable, fallback to assuming we are using an embedded base64 in the data element.
+	 *
+	 * @param theBinary          the Binary who's `data` blob you want to retrieve
+	 * @param myBinaryStorageSvc the binary storage service
+	 * @param myCtx              the FHIR context
+	 * @return a byte array containing the blob.
+	 * @throws IOException
+	 */
+	public static byte[] fetchBlobFromBinary(final IBaseBinary theBinary,
+														  final @Nullable IBinaryStorageSvc myBinaryStorageSvc,
+														  final FhirContext myCtx) throws IOException {
+		if (myBinaryStorageSvc != null && !(myBinaryStorageSvc instanceof NullBinaryStorageSvcImpl)) {
+			return myBinaryStorageSvc.fetchDataBlobFromBinary(theBinary);
+		} else {
+			byte[] value = BinaryUtil.getOrCreateData(myCtx, theBinary).getValue();
+			if (value == null) {
+				throw new InternalErrorException(
+					Msg.code(1296) + "Failed to fetch blob from Binary/" + theBinary.getIdElement());
+			}
+			return value;
+		}
+	}
+}