diff --git a/ExpressAPI/src/helpers/DojoValidators.ts b/ExpressAPI/src/helpers/DojoValidators.ts
index 0293660deb7449cc45f47366e7fac2868c801f2e..98a28252c6bca786fe23ad6b08e56db54c33aca0 100644
--- a/ExpressAPI/src/helpers/DojoValidators.ts
+++ b/ExpressAPI/src/helpers/DojoValidators.ts
@@ -4,8 +4,9 @@ import { CustomValidator, ErrorMessage, FieldMessageFactory, Meta } from 'expres
 import { BailOptions, ValidationChain }                             from 'express-validator/src/chain';
 import GitlabManager                                                from '../managers/GitlabManager';
 import express                                                      from 'express';
-import SharedExerciseHelper                                         from '../shared/helpers/Dojo/SharedExerciseHelper';
 import logger                                                       from '../shared/logging/WinstonLogger';
+import Json5FileValidator                                           from '../shared/helpers/Json5FileValidator';
+import ExerciseResultsFile                                          from '../shared/types/Dojo/ExerciseResultsFile';
 
 
 declare type DojoMeta = Meta & {
@@ -98,7 +99,7 @@ class DojoValidators {
                                                                               return new Promise((resolve, reject) => {
                                                                                   const results = this.getParamValue(req, path) as string;
                                                                                   if ( results ) {
-                                                                                      SharedExerciseHelper.validateResultFile(results, false).isValid ? resolve(true) : reject();
+                                                                                      Json5FileValidator.validateFile(ExerciseResultsFile, results, false).isValid ? resolve(true) : reject();
                                                                                   } else {
                                                                                       reject();
                                                                                   }
diff --git a/ExpressAPI/src/shared b/ExpressAPI/src/shared
index 039c8b4e10096a1c5036d01087d56443da636078..f370f8b0a6e7b059d12f1980cdd21e3f2daa2f04 160000
--- a/ExpressAPI/src/shared
+++ b/ExpressAPI/src/shared
@@ -1 +1 @@
-Subproject commit 039c8b4e10096a1c5036d01087d56443da636078
+Subproject commit f370f8b0a6e7b059d12f1980cdd21e3f2daa2f04