diff --git a/tolerant-reader/etc/tolerant-reader.png b/tolerant-reader/etc/tolerant-reader.png
index 396b2559b..45f0302a2 100644
Binary files a/tolerant-reader/etc/tolerant-reader.png and b/tolerant-reader/etc/tolerant-reader.png differ
diff --git a/tolerant-reader/etc/tolerant-reader.ucls b/tolerant-reader/etc/tolerant-reader.ucls
index 1c9065583..92e069f8e 100644
--- a/tolerant-reader/etc/tolerant-reader.ucls
+++ b/tolerant-reader/etc/tolerant-reader.ucls
@@ -1,45 +1,47 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <class-diagram version="1.1.8" icons="true" automaticImage="PNG" always-add-relationships="false" generalizations="true" 
   realizations="true" associations="true" dependencies="false" nesting-relationships="true">  
-  <class id="1" language="java" name="com.iluwatar.App" project="tolerant-reader" 
-    file="/tolerant-reader/src/main/java/com/iluwatar/App.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="106" width="130" x="207" y="280"/>    
+  <class id="1" language="java" name="com.iluwatar.tolerantreader.RainbowFishSerializer" project="tolerant-reader" 
+    file="/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishSerializer.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="123" y="415"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="2" language="java" name="com.iluwatar.RainbowFishV2" project="tolerant-reader" 
-    file="/tolerant-reader/src/main/java/com/iluwatar/RainbowFishV2.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="232" width="359" x="377" y="570"/>    
+  <class id="2" language="java" name="com.iluwatar.tolerantreader.RainbowFishV2" project="tolerant-reader" 
+    file="/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFishV2.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="389" y="685"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="3" language="java" name="com.iluwatar.RainbowFishSerializer" project="tolerant-reader" 
-    file="/tolerant-reader/src/main/java/com/iluwatar/RainbowFishSerializer.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="142" width="231" x="613" y="280"/>    
+  <class id="3" language="java" name="com.iluwatar.tolerantreader.RainbowFish" project="tolerant-reader" 
+    file="/tolerant-reader/src/main/java/com/iluwatar/tolerantreader/RainbowFish.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="389" y="404"/>    
     <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
       sort-features="false" accessors="true" visibility="true">      
       <attributes public="true" package="true" protected="true" private="true" static="true"/>      
       <operations public="true" package="true" protected="true" private="true" static="true"/>    
     </display>  
   </class>  
-  <class id="4" language="java" name="com.iluwatar.RainbowFish" project="tolerant-reader" 
-    file="/tolerant-reader/src/main/java/com/iluwatar/RainbowFish.java" binary="false" corner="BOTTOM_RIGHT">    
-    <position height="250" width="196" x="377" y="280"/>    
-    <display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
-      sort-features="false" accessors="true" visibility="true">      
-      <attributes public="true" package="true" protected="true" private="true" static="true"/>      
-      <operations public="true" package="true" protected="true" private="true" static="true"/>    
-    </display>  
-  </class>  
-  <generalization id="5">    
+  <dependency id="4">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="3"/>  
+  </dependency>  
+  <dependency id="5">    
+    <end type="SOURCE" refId="1"/>    
+    <end type="TARGET" refId="2"/>  
+  </dependency>  
+  <generalization id="6">    
     <end type="SOURCE" refId="2"/>    
-    <end type="TARGET" refId="4"/>  
+    <end type="TARGET" refId="3"/>  
   </generalization>  
   <classifier-display autosize="true" stereotype="true" package="true" initial-value="false" signature="true" 
     sort-features="false" accessors="true" visibility="true">