diff --git a/app/routers/hosted_file.py b/app/routers/hosted_file.py
index 14945d4..a98d7b5 100644
--- a/app/routers/hosted_file.py
+++ b/app/routers/hosted_file.py
@@ -34,25 +34,35 @@ async def create_upload_files(
         exclude_unset: Optional[bool] = True,
         ):
 
-    response_data = {}
-    response_data['account_id'] = account_id
-    response_data['filename'] = filename
-    response_data['object_type'] = object_type
-    response_data['object_id'] = object_id
+    data = {}
+    data['account_id'] = account_id
+    #data['filename'] = filename
+    data['object_type'] = object_type
+    data['object_id'] = object_id
+    data['file_li'] = []
 
     log.debug(await save_file_li(files))
 
     response_li = []
     for file in files:
-        response_detailed = {}
-        response_detailed['filename'] = file.filename
-        response_detailed['content_type'] = file.content_type
-        response_li.append(response_detailed)
+        file_info = {}
+        file_info['filename'] = file.filename
+        file_info['content_type'] = file.content_type
 
-    response = { 'response_data': response_data, 'response_li':response_li }
+        file.file.seek(0, os.SEEK_END)
+        file_size = file.file.tell()
+        file.file.seek(0) # The file will not properly save if seek is not reset to 0.
+        file_info['size'] = file_size
+        log.debug(file_size)
+
+        data['file_li'].append(file_info)
+
+    return mk_resp(data=data)
+
+    #response = { 'response_data': response_data, 'response_li':response_li }
     #response['filenames'] = [file.filename for file in files]
-    return response
-    return {'filenames': [file.filename for file in files]}
+    #return response
+    #return {'filenames': [file.filename for file in files]}
 
 
 # This is not needed. Just for reference of the mk_resp() function
@@ -81,7 +91,13 @@ async def save_file_li(file_li: List[UploadFile] = File(...)):
 
     result = []
     for file in file_li:
-        log.debug(f'{file.filename} | {file.spool_max_size}')
+        log.debug(f'{file.filename}')
+
+        file.file.seek(0, os.SEEK_END)
+        file_size = file.file.tell()
+        file.file.seek(0) # The file will not properly save if seek is not reset to 0.
+        #file_info['size'] = request_file_size
+        log.debug(file_size)
 
         file_hash = await get_file_object_hash(file.file)
         log.debug(file_hash)