diff --git a/30_Thesis/figures/50_design_and_implementation/MerlinCollabRecommender.pdf b/30_Thesis/figures/50_design_and_implementation/MerlinCollabRecommender.pdf
index c864381..3eabb5e 100644
Binary files a/30_Thesis/figures/50_design_and_implementation/MerlinCollabRecommender.pdf and b/30_Thesis/figures/50_design_and_implementation/MerlinCollabRecommender.pdf differ
diff --git a/30_Thesis/sections/10_foundations.tex b/30_Thesis/sections/10_foundations.tex
index 2bf1278..0a20d1f 100644
--- a/30_Thesis/sections/10_foundations.tex
+++ b/30_Thesis/sections/10_foundations.tex
@@ -199,14 +199,14 @@ Both the approach of merging preferences and the approach of using individual us
 \section{Base Recommender System}
 \label{sec:Foundations:BaseSystem}
 
-\citeauthor{raabKollaborativeProduktkonfigurationEchtzeit2019} \cite{raabKollaborativeProduktkonfigurationEchtzeit2019} extends CAS Merlin Configurator in his thesis to allow simultaneous configuration. The extended architecture is shown in \autoref{fig:DesignImplementation:CollaborativeConfiguratorMerlin}.
+\citeauthor{raabKollaborativeProduktkonfigurationEchtzeit2019} \cite{raabKollaborativeProduktkonfigurationEchtzeit2019} extends CAS Merlin Configurator in his thesis to allow simultaneous configuration. The extended architecture is shown in \autoref{fig:Foundations:CollaborativeConfiguratorMerlin}.
 He only makes changes to M.Customer which is renamed to M.Collab-Customer and introduces a new component M.Collab.
 
 \begin{figure}
     \centering
     \includegraphics[width=0.6\textwidth]{./figures/50_design_and_implementation/MerlinCollaborativeConfigurator.pdf}
     \caption{Architecture of Collaborative Configurator Merlin \cite[Fig. 4.3]{raabKollaborativeProduktkonfigurationEchtzeit2019}}
-    \label{fig:DesignImplementation:CollaborativeConfiguratorMerlin}
+    \label{fig:Foundations:CollaborativeConfiguratorMerlin}
 \end{figure}
 
 \begin{description}
diff --git a/30_Thesis/sections/50_design_and_implementation.tex b/30_Thesis/sections/50_design_and_implementation.tex
index 7b91c20..fe94b6e 100644
--- a/30_Thesis/sections/50_design_and_implementation.tex
+++ b/30_Thesis/sections/50_design_and_implementation.tex
@@ -23,7 +23,7 @@ Due to these reasons the decision was made to create a new microservice, called
 \begin{figure}
     \centering
     \includegraphics[width=0.6\textwidth]{./figures/50_design_and_implementation/MerlinCollabRecommender.pdf}
-    \caption{Architecture of Collaborative Configurator Merlin with the added recommender system.}
+    \caption{The architecture of the extended recommender system based on \cite[Fig. 4.3]{raabKollaborativeProduktkonfigurationEchtzeit2019}'s configurator (see \autoref{fig:Foundations:CollaborativeConfiguratorMerlin}). The changes include the addition of the component \emph{M.Recommend} and the recommender database. Changes are marked in grey. Components that have a grey background are added and components with a partial grey background undergo changes.}
     \label{fig:DesignImplementation:RecommenderForCollaborativeConfiguratorMerlin}
 \end{figure}
 
diff --git a/Additional_Notes/draw.io/MerlinCollabRecommender.drawio b/Additional_Notes/draw.io/MerlinCollabRecommender.drawio
index 7bc634f..1c9fe9a 100644
--- a/Additional_Notes/draw.io/MerlinCollabRecommender.drawio
+++ b/Additional_Notes/draw.io/MerlinCollabRecommender.drawio
@@ -1 +1 @@
-<mxfile host="www.draw.io" modified="2019-12-09T13:28:32.269Z" agent="Mozilla/5.0 (Windows NT 10.0; Win64; x64; rv:71.0) Gecko/20100101 Firefox/71.0" etag="9F-sz8phpVL5PfRKMlH8" version="12.3.8" type="device" pages="1"><diagram id="cNiUGcpUxYu83N4z4ARh" name="Page-1">7VlNc6M4EP01PjoFCLBznNiZzGFSNTXe7GxOUwoohl2MKCFiO79+JSMBQjJgxx+7NXNxoUYf6PXr1y15BGarzQOBWfSIQ5SMHCvcjMB85DgesNkvN2xLw8QBpWFJ4rA02bVhEb8jYbSEtYhDlCsdKcYJjTPVGOA0RQFVbJAQvFa7veJEXTWDS6QZFgFMdOuPOKSRsPqWVb/4guJlJJd25JsVlL2FIY9giNcNE7gfgRnBmJZPq80MJRw8CUw57vOet9WXEZTSIQOe3oM/vzxtyMP74932ZxJ58/nb2JmU07zBpBBb/l4kDHEGXxqy3znKUBqiNIi5cbcPupXooJCBJZqY0AgvcQqT+9p6R3DBRvMvsFir7vMV44wZbWb8G1G6FZ6HBcXMFNFVIt7quxQbz3FBAtSxNVfQBZIlol0QCP/wzTRWECA+ILxClGxZB8HpsXVj2bZTDiIogTR+U9kCBemW1dhqum84Zvuou+DX15x9XcNv7KGxam3aefMAz7qaYx9vRHi2vDgE7TdEKNoMgce7FXiKiAcT0V434mcqbFEjdOQ4E3oKOIci4WlIaBCw2Mz4Y4BXGU53my95KYN+Kg1VsLtGuDpdMRhDW0PMMQAmbcdyUPJZaoCUaHWCkzB0/dUjTzZ2EXr+5IyLuRsWaAx06blf/HENkUGbmP7Fh994ovUsJuPP802zsZWNlO2+MYg3n+V8vFEP27XkuJwJEv3EUxPnWwLzPA6k+XOcqJHY0qReITTiLPNmnxDaUzMpB/PrQ1Fart4SrBlOEvhyZsUCQFUsz/GvrFj27bUlq/LGr6tZ5mLB/+/ok32UPlk9+jRIZzoLqf6KyzOq2weUZzeUiSrcNjpknDP5fhJNHDXufdtvUqa/P7C6+4NpV3/2UH7xaQlqGWWUoDOLaLvsu76IVnu4mohWvvgtosb4bx86+WrWHFL4AnOdr9JXIeuQU85ocLeOYooWGdzp0prAbODhcbhHJpanBrGr+8j3dB9NzkZrvTYwl81pKKvMlwQH/7RLT2lk/RplZ7sMbSYhmVBsJZ3U2WVPQqmSV7O0rhKZOXldIAnJCqc3Ca2Ve5+TRJ7rtcQS+OoU5TbFqI4U49s9E5UwdEx0/mgH5ozEC/vxrGCRvELkzMmpXeFf/04CXD05gd/JyYyLo3nmB3pZMLEU611GZA+s2o85IRwvsuD/ILLVHb3UxmlriqEi6zk9E11WZI13PJ5OzcsdS+0DMntN8MOqCCWsUiaHrTiqCX2uOzNjP9dM55NfmXV95FE3ZprsG3AanE/9yQUPe0YodNE+bTrtgWu/e36dbLo/PtTDCmIOWPH/FMlZTnsfIrYns39FbEdz061r4PX0YF6zZv3fbwl3/Q86uP8X</diagram></mxfile>
\ No newline at end of file
+<mxfile host="app.diagrams.net" modified="2020-04-22T09:00:53.033Z" agent="5.0 (Windows)" etag="fIgQjG3jMiUjY1daNwzf" version="13.0.1" type="device"><diagram id="cNiUGcpUxYu83N4z4ARh" name="Page-1">7Vpdc5s6EP01fnQGkLGdx8R205km0zs3Tdo8dWSQbRqMPEL+yq+vBBIghEFx/JE2dWc6aJEEOrtnz0qkBQbzzQ2Bi9kd9lHYcix/0wLDluP0+j32PzdsU0O/d5kapiTwU5OdG+6DFySMlrAuAx/FSkeKcUiDhWr0cBQhjyo2SAheq90mOFSfuoBTpBnuPRjq1u+BT2fC2rWs/MZnFExn8tGOvDOG3vOU4GUkHthywCT5pbfnUE4m+scz6ON1wQRGLTAgGNP0ar4ZoJBjK3FLx33acTd7cYIiajLg4cV7/PywITcvd9fbn+HMHQ5XbUe4bwXDpUDk/2XIHMLQZQtzrCFaoMhHkRdwY7IOupXgIZ9hKZqY0Bme4giGo9x6neCD+BtYrJX3ucV4wYw2M/5ClG5FYMAlxcykL02sNsZL4qGa9XRECEEyRbRu3cIpfAWFJwjkbhCeI0q2rIOI87Z1Ydm2kw4iKIQ0WKkRBEUgTrOx2XT/4YCtI++CJ5OYvV3BWeyi8NTclLjwFe7saN68uxCULbluJ8QrRCjamGDiXgoQBfVBT7TXBSL1hW1W4JAcVwWZgshrl+9qy9fWzVi44Jceni9wlCw+jUDJ/r40ZKzvVEZkLf7GGNoaYk4FYNK2b+DJIJZsFw7rqRMcJCzXty55sHEHoacrp70cdvwlagM9yYzuv50snaBNQH/wMReuaD2JGfj1cFNsbGUjYksuDOLNJ/GIpJEPS1pyXMxSD73iwsSDLIRxHHjS/CngsCVTGGW4SiylSDZlOLtvmOGMg+pN1JSvo6SmAQ5DONbiYEqgHzBg2G1MmCliROUYSgHlOE85tOJ6wnCVfXMVZnacz8HsVvJj9gjfwjFqdIU5iwFQM6HrdM+cCe3Lc6fCzOEfNxeufvy8/bq2xg9r58vsGrqP1/NHyd86x6hZbmfYM7/x3CLSDsHPqESYEi9GyT8+STW/dvjL2Ne6YyW2hnWBcyw2SDqeQGtmdC4TS7Xs2HvJjtUgO0Z6UlsJN5fM7qEFJRnKtBJuCx0WnKfxbuL2QF8hbtfuFuOjuT+wSvGUvsFB63AJakntCNLi8ADqU67Dz68+jkGSO676ZA74uOpTS+Lyfp8/jUUN2FwxjIeQwjGM9WCVPvNZh5jycD5I+dSzXJWiHd0ZXVd3Ru9o8atXT9UblsiXpf44xN5zuf6XRtavUPuX9wJFyZDp31aSf64FO9J/JjXF/U0mO9VScwLJMN6DrJWjt4NQrOOWsiLoqlOkyxSjagSkazdMlMJQM9HxaQ2q9YbvrtqDJaPqHBEteo++DTr/gRA4uxCBf0JUuQ0yOKpTC/BClvwDdkTAqvbxe9kRAUfD/zsa3zO5Eu4+vMztu7XZZxu1v7aBP0Hbsq9TUpL6pSlMtc11GiY6rbZVHni6ejyebu9ut8wLqjzAX1e8KVySZ50F8hgHtOl5cWW/jmE4H/y4uO6tTU6LlaRfVAY1CGoOjDMZUDWjeGRcOkpOf8pRcq2X9q+hur0TbuYrXaErxfFKqNpY+LgVVB1hi3tUxBww55/ryb67eWNmdJNfDTMOwAVXVikZFxzNs5edCir0306F6rP73dssDd23fMSS1Wrj96s86TQUqe/4+1U10sfeuDXgVeP+j5N2qkHQP+a/5qhhR6gfIYhPevpQDZWeot9BEIO/OohZM/+TurR7/neLYPQb</diagram></mxfile>
\ No newline at end of file