diff --git a/Map/Models/Stateless/MapLogic.cs b/Map/Models/Stateless/MapLogic.cs
index 71e1871..7e27134 100644
--- a/Map/Models/Stateless/MapLogic.cs
+++ b/Map/Models/Stateless/MapLogic.cs
@@ -472,14 +472,12 @@ internal abstract class MapLogic
         }
     }
 
-    static void SavePossiblyNewPersonContainers(string personBirthdayFormat, char[] personCharacters, string facesFileNameExtension, string? a2PeopleSingletonDirectory, List<(string[], PersonContainer)> possiblyNewPersonDisplayDirectoryNamesAndPersonContainer)
+    static void SavePossiblyNewPersonContainers(string personBirthdayFormat, string facesFileNameExtension, string? a2PeopleSingletonDirectory, List<(string[], PersonContainer)> possiblyNewPersonDisplayDirectoryNamesAndPersonContainer)
     {
         string json;
         string[] files;
         string checkFile;
-        string[] segments;
         const int zero = 0;
-        char personCharacter;
         string personKeyFormatted;
         string personDisplayDirectory;
         PersonBirthday personBirthday;
@@ -489,18 +487,13 @@ internal abstract class MapLogic
         JsonSerializerOptions jsonSerializerOptions = new() { WriteIndented = true };
         foreach ((string[] personDisplayDirectoryNames, PersonContainer personContainer) in possiblyNewPersonDisplayDirectoryNamesAndPersonContainer)
         {
-            if (a2PeopleSingletonDirectory is null || personContainer.Key is null || personContainer.Birthdays is null || !personContainer.Birthdays.Any())
+            if (a2PeopleSingletonDirectory is null || personContainer.Key is null || personContainer.Birthdays is null || personContainer.PersonDirectory is null || !personContainer.Birthdays.Any())
                 continue;
             personBirthday = personContainer.Birthdays[zero];
             personDisplayDirectoryName = personDisplayDirectoryNames[^1];
             personDisplayDirectory = Path.Combine(personDisplayDirectoryNames);
             personKeyFormatted = IPersonBirthday.GetFormatted(personBirthdayFormat, personBirthday);
-            segments = personDisplayDirectoryName.Split(personCharacters);
-            if (segments.Length != 2)
-                personCharacter = '_';
-            else
-                personCharacter = personDisplayDirectoryName[segments[zero].Length];
-            checkPersonDisplayDirectory = Path.Combine(a2PeopleSingletonDirectory, personCharacter.ToString(), personDisplayDirectoryName);
+            checkPersonDisplayDirectory = Path.Combine(a2PeopleSingletonDirectory, personContainer.PersonDirectory.Char.ToString(), personContainer.PersonDirectory.Group, personDisplayDirectoryName);
             checkPersonKeyFormattedDirectory = Path.Combine(checkPersonDisplayDirectory, personKeyFormatted);
             if (Directory.Exists(checkPersonKeyFormattedDirectory))
                 continue;
@@ -769,7 +762,7 @@ internal abstract class MapLogic
         SetPersonKeyToPersonContainer(configuration, personContainers, personKeyCollection, personKeyToPersonContainer, personKeyToPersonContainerCollection);
         notMappedPersonContainers.AddRange(GetNotMappedPersonContainers(configuration, personContainers, personKeyCollection));
         if (possiblyNewPersonDisplayDirectoryNamesAndPersonContainer.Any())
-            SavePossiblyNewPersonContainers(configuration.PersonBirthdayFormat, configuration.PersonCharacters.ToArray(), configuration.FacesFileNameExtension, a2PeopleSingletonDirectory, possiblyNewPersonDisplayDirectoryNamesAndPersonContainer);
+            SavePossiblyNewPersonContainers(configuration.PersonBirthdayFormat, configuration.FacesFileNameExtension, a2PeopleSingletonDirectory, possiblyNewPersonDisplayDirectoryNamesAndPersonContainer);
     }
 
     private static string GetMappingSegmentB(long ticks, PersonBirthday personBirthday, int? approximateYears, long minimumDateTimeTicks, bool? isWrongYear)
diff --git a/Shared/Models/Stateless/Methods/PersonContainer.cs b/Shared/Models/Stateless/Methods/PersonContainer.cs
index 94aa9c0..ff29a4e 100644
--- a/Shared/Models/Stateless/Methods/PersonContainer.cs
+++ b/Shared/Models/Stateless/Methods/PersonContainer.cs
@@ -263,6 +263,8 @@ internal abstract class PersonContainer
             {
                 innerGroupDirectoryName = Path.GetFileName(innerGroupDirectory);
                 segments = innerGroupDirectoryName.Split('-');
+                if (!segments.Any())
+                    throw new NotSupportedException("Misplaced directory!");
                 if (segments.Length != 3)
                     continue;
                 if (segments[zero] is not "Alive" and not "Dead" and not "Unknown")