diff --git a/README.md b/README.md
index 650cf702825fc0b8065c5ef2b13482198357ff24..a0558388e93f5dcb0cdf0fabac58c84a79ac4814 100644
--- a/README.md
+++ b/README.md
@@ -54,7 +54,7 @@ File -> Import -> Maven -> Existing Maven project
 ```
 
 ## Client-side Architecture
-
+[TBD]
 Compared to the [standard Petclinic based on JSP pages](https://github.com/spring-projects/spring-petclinic), 
 this ~~SpringBoot AngularJS Petclinic is splitted in 2 modules - a client module and a server module~~:
 * springboot-petclinic-client : static resources (images, fonts, style, angular JS code) packaged as a webjar.
@@ -65,31 +65,35 @@ this ~~SpringBoot AngularJS Petclinic is splitted in 2 modules - a client module
 
 <table>
   <tr>
-    <th width="300px">Spring Boot Configuration</th><th width="300px"></th>
+    <th width="300px">Spring Cloud components</th><th width="300px"></th>
   </tr>
   <tr>
-    <td>The Main Class</td>
-    <td><a href="/springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/application/PetClinicApplication.java">PetClinicApplication.java</a></td>
+    <td>Configuration server</td>
+    <td><a href="https://github.com/spring-petclinic/spring-petclinic-microservices/blob/master/spring-petclinic-config-server/src/main/resources/application.yml">Config server properties</a>, 
+        <a href="https://github.com/spring-petclinic/spring-petclinic-microservices-config">Configuration repository</a></td>
   </tr>
   <tr>
-    <td>Properties Files</td>
+    <td>Service discovery</td>
     <td>
-      <a href="/springboot-petclinic-server/src/main/resources/application.properties">application.properties</a>
-      <a href="/springboot-petclinic-server/src/main/resources/application-dev.properties">application-dev.properties</a>
-      <a href="/springboot-petclinic-server/src/main/resources/application-prod.properties">application-prod.properties</a>
+      <a href="https://github.com/spring-petclinic/spring-petclinic-microservices/tree/master/spring-petclinic-discovery-server">Eureka server</a>, 
+      <a href="https://github.com/spring-petclinic/spring-petclinic-microservices/blob/master/spring-petclinic-vets-service/src/main/java/org/springframework/samples/petclinic/vets/VetsServiceApplication.java">Service discovery client</a>
     </td>
   </tr>
   <tr>
-    <td>Caching</td>
-    <td>Use JCache with EhCache <a href="/springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/config/CacheConfig.java">CacheConfig.java</a> <a href="/src/main/resources/ehcache.xml">ehcache.xml</a></td>
+    <td>API gateway</td>
+    <td><a href="https://github.com/spring-petclinic/spring-petclinic-microservices/blob/master/spring-petclinic-api-gateway/src/main/java/org/springframework/samples/petclinic/api/ApiGatewayApplication.java">Zuul reverse proxy</a>,
+    <a href="https://github.com/spring-petclinic/spring-petclinic-microservices-config/blob/master/api-gateway.yml">Routing configuration</a></td>
+  </tr>
+  <tr>
+      <td>Circuit breaker</td>
+      <td>TBD</td>
+  </tr>
+  <tr>
+      <td>Graphite monitoring</td>
+      <td>TBD</td>
   </tr>
-    <tr>
-      <td>Homepage</td>
-      <td>Map root context to the index.html template <a href="/springboot-petclinic-server/src/main/java/org/springframework/samples/petclinic/config/WebConfig.java">WebConfig.java</a> <a href="/src/main/resources/ehcache.xml">ehcache.xml</a></td>
-    </tr>
 </table>
 
-
 <table>
   <tr>
     <th width="300px">Front-end module</th><th width="300px">Files</th>
@@ -97,25 +101,26 @@ this ~~SpringBoot AngularJS Petclinic is splitted in 2 modules - a client module
   <tr>
       <td>Node and NPM</td>
       <td>
-        <a href="/springboot-petclinic-client/pom.xml">The frontend-maven-plugin plugin downloads/installs Node and NPM locally then runs Bower and Gulp</a> 
+        <a href="https://github.com/spring-petclinic/spring-petclinic-microservices/blob/master/spring-petclinic-client/pom.xml">The frontend-maven-plugin plugin downloads/installs Node and NPM locally then runs Bower and Gulp</a> 
       </td>
   </tr>
   <tr>
       <td>Bower</td>
       <td>
-        <a href="/springboot-petclinic-client/bower.json">JavaScript libraries are defined by the manifest file bower.json</a>
+        <a href="https://github.com/spring-petclinic/spring-petclinic-microservices/blob/master/spring-petclinic-client/bower.json">JavaScript libraries are defined by the manifest file bower.json</a>
       </td>
   </tr>
   <tr>
       <td>Gulp</td>
       <td>
-        <a href="/springboot-petclinic-client/gulpfile.js">Tasks automated by Gulp: minify CSS and JS, generate CSS from LESS, copy other static resources</a> 
+        <a href="https://github.com/spring-petclinic/spring-petclinic-microservices/blob/master/spring-petclinic-client/gulpfile.js">Tasks automated by Gulp: minify CSS and JS, generate CSS from LESS, copy other static resources</a> 
       </td>
   </tr>
     <tr>
         <td>AngularJS</td>
         <td>
-          <a href="/springboot-petclinic-client/scripts/">app.js, controllers and templates</a> 
+          <a href="https://github.com/spring-petclinic/spring-petclinic-microservices/blob/master/spring-petclinic-client/src/scripts/app.js">Application module</a>, 
+           <a href="https://github.com/toddmotto/angular-1-5-components-app">Angular 1.5 component architecture</a>
         </td>
     </tr>
 </table>