diff --git a/collection-pipeline/etc/collection-pipeline.png b/collection-pipeline/etc/collection-pipeline.png
index 7fcdb0b94..67d52629c 100644
Binary files a/collection-pipeline/etc/collection-pipeline.png and b/collection-pipeline/etc/collection-pipeline.png differ
diff --git a/collection-pipeline/etc/collection-pipeline.ucls b/collection-pipeline/etc/collection-pipeline.ucls
index 676dc48e8..6373db62f 100644
--- a/collection-pipeline/etc/collection-pipeline.ucls
+++ b/collection-pipeline/etc/collection-pipeline.ucls
@@ -4,7 +4,7 @@
   <class id="1" language="java" name="com.iluwatar.collectionpipeline.App" project="collection-pipeline" 
     file="/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/App.java" binary="false" 
     corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="952" y="278"/>    
+    <position height="-1" width="-1" x="150" y="100"/>    
     <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"/>      
@@ -15,7 +15,7 @@
     project="collection-pipeline" 
     file="/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/ImperativeProgramming.java" binary="false" 
     corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="552" y="107"/>    
+    <position height="-1" width="-1" x="437" y="109"/>    
     <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"/>      
@@ -25,34 +25,70 @@
   <class id="3" language="java" name="com.iluwatar.collectionpipeline.Car" project="collection-pipeline" 
     file="/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Car.java" binary="false" 
     corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="476" y="301"/>    
+    <position height="-1" width="-1" x="724" y="339"/>    
     <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.collectionpipeline.FunctionalProgramming" 
+  <class id="4" language="java" name="com.iluwatar.collectionpipeline.CarFactory" project="collection-pipeline" 
+    file="/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/CarFactory.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="899" y="91"/>    
+    <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="5" language="java" name="com.iluwatar.collectionpipeline.FunctionalProgramming" 
     project="collection-pipeline" 
     file="/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/FunctionalProgramming.java" binary="false" 
     corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="914" y="105"/>    
+    <position height="-1" width="-1" x="1187" y="109"/>    
     <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="5" language="java" name="com.iluwatar.collectionpipeline.Iterating" project="collection-pipeline" 
-    file="/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Iterating.java" binary="false" 
+  <enumeration id="6" language="java" name="com.iluwatar.collectionpipeline.Category" project="collection-pipeline" 
+    file="/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Category.java" binary="false" 
     corner="BOTTOM_RIGHT">    
-    <position height="-1" width="-1" x="723" y="280"/>    
+    <position height="-1" width="-1" x="486" y="339"/>    
+    <display autosize="true" stereotype="true" package="true" initial-value="true" 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>  
+  </enumeration>  
+  <class id="7" language="java" name="com.iluwatar.collectionpipeline.Person" project="collection-pipeline" 
+    file="/collection-pipeline/src/main/java/com/iluwatar/collectionpipeline/Person.java" binary="false" 
+    corner="BOTTOM_RIGHT">    
+    <position height="-1" width="-1" x="723" y="91"/>    
     <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>  
+  <association id="8">    
+    <end type="SOURCE" refId="7" navigable="false">      
+      <attribute id="9" name="cars"/>      
+      <multiplicity id="10" minimum="0" maximum="2147483647"/>    
+    </end>    
+    <end type="TARGET" refId="3" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
+  <association id="11">    
+    <end type="SOURCE" refId="3" navigable="false">      
+      <attribute id="12" name="category"/>      
+      <multiplicity id="13" minimum="0" maximum="1"/>    
+    </end>    
+    <end type="TARGET" refId="6" navigable="true"/>    
+    <display labels="true" multiplicity="true"/>  
+  </association>  
   <classifier-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"/>