diff --git a/docs/DeveloperGuide.md b/docs/DeveloperGuide.md
index 7243d342745..0aa3a86d9c8 100644
--- a/docs/DeveloperGuide.md
+++ b/docs/DeveloperGuide.md
@@ -664,7 +664,7 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
 1.  User requests to list all contacts
 2.  Elder Scrolls shows a list of all contacts
 3.  User requests to delete a specific contact.
-4.  Elder Scrolls deletes the specific contact.
+4.  Elder Scrolls deletes the specified contact.
 
     Use case ends.
 
@@ -678,9 +678,9 @@ Priorities: High (must have) - `* * *`, Medium (nice to have) - `* *`, Low (unli
 
 * 4a. The contact requested to be deleted is still paired.
 
-  * 4a1. Elder Scrolls shows an error message.
-
-    Use case resumes at step 2.
+    * 4a1. Elder Scrolls shows an error message.
+    
+      Use case resumes at step 2.
 
 **Use case: UC03 - List all contacts and logs**
 
diff --git a/docs/diagrams/BetterModelClassDiagram.puml b/docs/diagrams/BetterModelClassDiagram.puml
index 08890c949b5..6f49670d48e 100644
--- a/docs/diagrams/BetterModelClassDiagram.puml
+++ b/docs/diagrams/BetterModelClassDiagram.puml
@@ -12,16 +12,21 @@ UniqueTagList -[hidden]down- UniquePersonList
 UniqueTagList -right-> "*" Tag
 UniquePersonList -right-> Person
 
+Person *-up-> personId
 Person -up-> "*" Tag
+personId -[hidden]left--> Tag
 
 Volunteer .left.|> Person
 Befriendee .left.|> Person
 
+
 Person *--> Name
 Person *--> Phone
 Person *--> Email
 Person *--> Address
-Person *--> "0..1" pairedWith
+Person *--> "0..1" pairedWithId
+Person --> "0..1" pairedWithName
+Person *--> "0..1" latestLogId
 Person *--> Role
 Person *--> timeServed
 @enduml
diff --git a/docs/diagrams/DatastoreClassDiagram.puml b/docs/diagrams/DatastoreClassDiagram.puml
index 783002e3efd..3d0b96d4967 100644
--- a/docs/diagrams/DatastoreClassDiagram.puml
+++ b/docs/diagrams/DatastoreClassDiagram.puml
@@ -45,9 +45,13 @@ Person *--> Name
 Person *--> Phone
 Person *--> Email
 Person *--> Address
+Person --> pairedWithName
+Person *--> pairedWithId
+Person *--> latestLogId
 Person -up-> "*" Tag
 Person *--> Role
-Person -left-> timeServed
+Person *-left-> timeServed
+Person *-left-> personId
 
 Volunteer .up.|> Person
 Befriendee .up.|> Person
@@ -61,9 +65,6 @@ Person -[hidden]right--> Befriendee
 ReadOnlyPersonStore -[hidden]right--> Datastore
 ReadOnlyLogStore -[hidden]right--> ReadOnlyPersonStore
 
-Person -[hidden]up--> I
-UniquePersonList -[hidden]right-> I
-
 Name -[hidden]right-> Phone
 Phone -[hidden]right-> Address
 Address -[hidden]right-> Email
diff --git a/docs/images/BetterModelClassDiagram.png b/docs/images/BetterModelClassDiagram.png
index 5b3071d4656..8b008bb7c24 100644
Binary files a/docs/images/BetterModelClassDiagram.png and b/docs/images/BetterModelClassDiagram.png differ
diff --git a/docs/images/DatastoreClassDiagram.png b/docs/images/DatastoreClassDiagram.png
index b8d9eec3479..47838c4ba39 100644
Binary files a/docs/images/DatastoreClassDiagram.png and b/docs/images/DatastoreClassDiagram.png differ