diff --git a/src/user_session_builder.py b/src/user_session_builder.py
index f649473077273d71b7bd9aac40efce54247e262f..f0ae0d875c4afe793f75becb07e06e4f590d27d1 100644
--- a/src/user_session_builder.py
+++ b/src/user_session_builder.py
@@ -178,7 +178,9 @@ class User:
 
         return {
             "first_submit_time": min([s.first_submit for _, s in self.sessions.items()]),
-            "max_finish_time": min([s.max_finish_time for _, s in self.sessions.items()]),
+            "max_finish_time": self.__max_finish_time,
+            "last_submit_time": self.__last_submit_time,
+            "last_finish_time": self.__last_finish_time,
             "nb_sessions": len(self.sessions),
             "sessions": [s.to_session_stat() for _, s in self.sessions.items()]
         }
\ No newline at end of file
diff --git a/swf2userSessions.py b/swf2userSessions.py
index b3ce842dcbd011d5a6a50eec577f128689814272..e69a55cead704e3ccefa30e7400af8665cdc45d4 100755
--- a/swf2userSessions.py
+++ b/swf2userSessions.py
@@ -11,7 +11,7 @@ def swf2sessions(input_swf, output_dir, delim_approach, delim_threshold,
     users = {}
 
     if not os.path.exists(output_dir):
-        raise FileExistsError(f"Output folder '{output_dir}' does not exist")
+        os.makedirs(output_dir)
 
     if build_graph_rep:
         if not os.path.exists(f"{output_dir}/graphs"):
@@ -71,7 +71,7 @@ def swf2sessions(input_swf, output_dir, delim_approach, delim_threshold,
         for user_id, user in users.items():
             stats[user_id] = user.to_session_stat()
 
-        with open(f"{output_dir}/session_stat.json", "w") as file:
+        with open(f"{output_dir}_session_stat.json", "w") as file:
             json.dump(stats, file)
 
     if not quiet: