diff --git a/src/main/java/de/w665/sharepulse/rest/mappings/Upload.java b/src/main/java/de/w665/sharepulse/rest/mappings/Upload.java
index 666dcac..638ce6d 100644
--- a/src/main/java/de/w665/sharepulse/rest/mappings/Upload.java
+++ b/src/main/java/de/w665/sharepulse/rest/mappings/Upload.java
@@ -14,6 +14,9 @@ import org.springframework.web.bind.annotation.RequestParam;
 import org.springframework.web.bind.annotation.RestController;
 import org.springframework.web.multipart.MultipartFile;
 
+import java.util.HashMap;
+import java.util.Map;
+
 @Slf4j
 @RestController
 public class Upload extends ApiRestController {
@@ -27,7 +30,7 @@ public class Upload extends ApiRestController {
 
     // Currently testing
     @PostMapping("/upload")
-    public ResponseEntity<String> getUpload(@RequestParam("file") MultipartFile file, HttpServletRequest request,
+    public ResponseEntity<Map<String, Object>> getUpload(@RequestParam("file") MultipartFile file, HttpServletRequest request,
                                             @RequestParam(value = "passwordProtected", required = false) Boolean passwordProtected,
                                             @RequestParam(value = "singleDownload", defaultValue = "false") boolean singleDownload,
                                             @RequestParam(value = "fileDescription", required = false) String fileDescription) {
@@ -36,21 +39,23 @@ public class Upload extends ApiRestController {
 
         if (file.isEmpty()) {
             log.debug("User tried to upload an empty file. IP: " + request.getRemoteAddr());
-            return new ResponseEntity<>("Please select a file to upload.", HttpStatus.NOT_ACCEPTABLE);
+            Map<String, Object> response = new HashMap<>();
+            response.put("message", "Please select a file to upload.");
+            return new ResponseEntity<>(response, HttpStatus.NOT_ACCEPTABLE);
         }
 
         FileUpload fileUpload = fileService.processUploadedFile(file, request.getRemoteAddr(), passwordProtected, singleDownload, fileDescription);
         log.debug("User uploaded file " + file.getOriginalFilename() + " from IP " + request.getRemoteAddr() + " successfully.");
 
-        JsonObject response = new JsonObject();
-        response.addProperty("fileId", fileUpload.getFileId());
-        response.addProperty("fileName", fileUpload.getFileName());
-        response.addProperty("message", "File " + file.getOriginalFilename() + " uploaded successfully!");
-        response.addProperty("passwordProtected", fileUpload.isPasswordProtected());
-        response.addProperty("singleDownload", fileUpload.isSingleDownload());
-        response.addProperty("uploadDate", fileUpload.getUploadDate().toString());
-        response.addProperty("password", fileUpload.getDownloadPassword());
+        Map<String, Object> response = new HashMap<>();
+        response.put("fileId", fileUpload.getFileId());
+        response.put("fileName", fileUpload.getFileName());
+        response.put("message", "File " + fileUpload.getFileName() + " uploaded successfully!");
+        response.put("passwordProtected", fileUpload.isPasswordProtected());
+        response.put("singleDownload", fileUpload.isSingleDownload());
+        response.put("uploadDate", fileUpload.getUploadDate().toString());
+        response.put("password", fileUpload.getDownloadPassword());
 
-        return new ResponseEntity<>(response.toString(), HttpStatus.OK);
+        return new ResponseEntity<>(response, HttpStatus.OK);
     }
 }