diff --git a/src/app/package.json b/src/app/package.json
index 0dadb713bea2197c486712223d49df0cba0a16b8..bc368ae04d99f2e78f78c31e5092815dba9ca3cc 100644
--- a/src/app/package.json
+++ b/src/app/package.json
@@ -61,6 +61,8 @@
   "dependencies": {
     "@project-sunbird/ext-framework-server": "0.1.27",
     "@project-sunbird/logger": "^0.0.9",
+    "@project-sunbird/form-service": "0.0.13",
+    "@project-sunbird/review-comment": "0.0.8",
     "async": "2.5.0",
     "azure-storage": "2.10.2",
     "body-parser": "1.17.2",
@@ -99,8 +101,7 @@
     "svg2img": "0.6.1",
     "ua-parser-js": "0.7.13",
     "uuid": "3.1.0",
-    "uuid-validate": "0.0.3",
-    "log4js": "^4.0.2"
+    "uuid-validate": "0.0.3"
   },
   "standard": {
     "env": {
diff --git a/src/app/yarn.lock b/src/app/yarn.lock
index 777d77e967c4d558f7201735b2595db51d1bc6b3..9d388ddd1452ef75ee3d8ed052787fb7527ecfcc 100644
--- a/src/app/yarn.lock
+++ b/src/app/yarn.lock
@@ -127,6 +127,14 @@
     typescript-ioc "^1.2.4"
     uuid "^3.2.1"
 
+"@project-sunbird/form-service@0.0.13":
+  version "0.0.13"
+  resolved "https://registry.yarnpkg.com/@project-sunbird/form-service/-/form-service-0.0.13.tgz#5b1156f8133385772de4dea6817da20a0bade5cb"
+  integrity sha512-dd8VhWk2e2/bx0I6TyZte2LON2ywAaM8ahhe/Xd5QLIACiz2B1T+d7IEkDuEhuvZ5IM01sZwzzTqtdg3qelL0Q==
+  dependencies:
+    joi "^13.4.0"
+    lodash "^4.17.10"
+
 "@project-sunbird/logger@^0.0.9":
   version "0.0.9"
   resolved "https://registry.yarnpkg.com/@project-sunbird/logger/-/logger-0.0.9.tgz#709b4a4dcfc59fb19f7e1ffb218136fa55b866ea"
@@ -139,6 +147,15 @@
     winston "^3.2.1"
     winston-daily-rotate-file "^4.4.2"
 
+"@project-sunbird/review-comment@0.0.8":
+  version "0.0.8"
+  resolved "https://registry.yarnpkg.com/@project-sunbird/review-comment/-/review-comment-0.0.8.tgz#f297b11b951eb051b4ccc36b81b1ffc32288c088"
+  integrity sha512-oh9Hl4nb+G0sLVLX1MiE8UKo1Yloj/xR0ufmGfK8qMoV7tU0NHVwgM3viCRFDGUgBVdJBydZeszVPLQy1iRFwA==
+  dependencies:
+    joi "^13.4.0"
+    lodash "^4.17.10"
+    rxjs "^6.2.1"
+
 "@project-sunbird/telemetry-sdk@0.0.8":
   version "0.0.8"
   resolved "https://registry.yarnpkg.com/@project-sunbird/telemetry-sdk/-/telemetry-sdk-0.0.8.tgz#d6dc287c177a8251909007d3d8be6ce2e6ad20fa"
@@ -686,7 +703,7 @@ async@2.5.0:
   dependencies:
     lodash "^4.14.0"
 
-async@^2.5.0, async@^2.6.2:
+async@^2.5.0:
   version "2.6.3"
   resolved "https://registry.yarnpkg.com/async/-/async-2.6.3.tgz#d72625e2344a3656e3a3ad4fa749fa83299d82ff"
   integrity sha512-zflvls11DCy+dQWzTW2dzuilv8Z5X/pjfmZOWba6TNIVDm+2UDaJmXSOXlasHKfNBs8oo3M0aT50fDEWfKZjXg==
@@ -1731,11 +1748,6 @@ date-format@^1.2.0:
   resolved "https://registry.yarnpkg.com/date-format/-/date-format-1.2.0.tgz#615e828e233dd1ab9bb9ae0950e0ceccfa6ecad8"
   integrity sha1-YV6CjiM90aubua4JUODOzPpuytg=
 
-date-format@^2.0.0:
-  version "2.1.0"
-  resolved "https://registry.yarnpkg.com/date-format/-/date-format-2.1.0.tgz#31d5b5ea211cf5fd764cd38baf9d033df7e125cf"
-  integrity sha512-bYQuGLeFxhkxNOF3rcMtiZxvCBAquGzZm6oWA1oZ0g2THUzivaRhv8uOhdr19LmoobSOLoIAxeUK2RdbM8IFTA==
-
 dateformat@2.0.0:
   version "2.0.0"
   resolved "https://registry.yarnpkg.com/dateformat/-/dateformat-2.0.0.tgz#2743e3abb5c3fc2462e527dca445e04e9f4dee17"
@@ -2848,15 +2860,6 @@ fs-extra@^3.0.0:
     jsonfile "^3.0.0"
     universalify "^0.1.0"
 
-fs-extra@^7.0.1:
-  version "7.0.1"
-  resolved "https://registry.yarnpkg.com/fs-extra/-/fs-extra-7.0.1.tgz#4f189c44aa123b895f722804f55ea23eadc348e9"
-  integrity sha512-YJDaCJZEnBmcbw13fvdAM9AwNOJwOzrE4pqMqBq5nFiEqXUqHwlK4B+3pUw6JNvfSPtX05xFHtYy/1ni01eGCw==
-  dependencies:
-    graceful-fs "^4.1.2"
-    jsonfile "^4.0.0"
-    universalify "^0.1.0"
-
 fs-minipass@^1.2.5:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/fs-minipass/-/fs-minipass-1.2.7.tgz#ccff8570841e7fe4265693da88936c55aed7f7c7"
@@ -3933,7 +3936,7 @@ istanbul-reports@^2.2.4:
   dependencies:
     html-escaper "^2.0.0"
 
-joi@^13.x:
+joi@^13.4.0, joi@^13.x:
   version "13.7.0"
   resolved "https://registry.yarnpkg.com/joi/-/joi-13.7.0.tgz#cfd85ebfe67e8a1900432400b4d03bbd93fb879f"
   integrity sha512-xuY5VkHfeOYK3Hdi91ulocfuFopwgbSORmIwzcwHKESQhC7w1kD5jaVSPnqDxS2I8t3RZ9omCKAxNwXN5zG1/Q==
@@ -4051,13 +4054,6 @@ jsonfile@^3.0.0:
   optionalDependencies:
     graceful-fs "^4.1.6"
 
-jsonfile@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/jsonfile/-/jsonfile-4.0.0.tgz#8771aae0799b64076b76640fca058f9c10e33ecb"
-  integrity sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=
-  optionalDependencies:
-    graceful-fs "^4.1.6"
-
 jsonify@~0.0.0:
   version "0.0.0"
   resolved "https://registry.yarnpkg.com/jsonify/-/jsonify-0.0.0.tgz#2c74b6ee41d93ca51b7b5aaee8f503631d252a73"
@@ -4508,6 +4504,11 @@ lodash@^3.10.1:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-3.10.1.tgz#5bf45e8e49ba4189e17d482789dfd15bd140b7b6"
   integrity sha1-W/Rejkm6QYnhfUgnid/RW9FAt7Y=
 
+lodash@^4.17.10:
+  version "4.17.20"
+  resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
+  integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
+
 log-driver@^1.x:
   version "1.2.7"
   resolved "https://registry.yarnpkg.com/log-driver/-/log-driver-1.2.7.tgz#63b95021f0702fedfa2c9bb0a24e7797d71871d8"
@@ -4524,17 +4525,6 @@ log4js@^3.0.0, log4js@^3.0.6:
     rfdc "^1.1.2"
     streamroller "0.7.0"
 
-log4js@^4.0.2:
-  version "4.5.1"
-  resolved "https://registry.yarnpkg.com/log4js/-/log4js-4.5.1.tgz#e543625e97d9e6f3e6e7c9fc196dd6ab2cae30b5"
-  integrity sha512-EEEgFcE9bLgaYUKuozyFfytQM2wDHtXn4tAN41pkaxpNjAykv11GVdeI4tHtmPWW4Xrgh9R/2d7XYghDVjbKKw==
-  dependencies:
-    date-format "^2.0.0"
-    debug "^4.1.1"
-    flatted "^2.0.0"
-    rfdc "^1.1.4"
-    streamroller "^1.0.6"
-
 logform@^2.2.0:
   version "2.2.0"
   resolved "https://registry.yarnpkg.com/logform/-/logform-2.2.0.tgz#40f036d19161fc76b68ab50fdc7fe495544492f2"
@@ -6350,7 +6340,7 @@ retry@^0.10.1:
   resolved "https://registry.yarnpkg.com/retry/-/retry-0.10.1.tgz#e76388d217992c252750241d3d3956fed98d8ff4"
   integrity sha1-52OI0heZLCUnUCQdPTlW/tmNj/Q=
 
-rfdc@^1.1.2, rfdc@^1.1.4:
+rfdc@^1.1.2:
   version "1.1.4"
   resolved "https://registry.yarnpkg.com/rfdc/-/rfdc-1.1.4.tgz#ba72cc1367a0ccd9cf81a870b3b58bd3ad07f8c2"
   integrity sha512-5C9HXdzK8EAqN7JDif30jqsBzavB7wLpaubisuQIGHWf2gUXSpzy6ArX/+Da8RjFpagWsCn+pIgxTMAmKw9Zug==
@@ -6858,17 +6848,6 @@ streamroller@0.7.0:
     mkdirp "^0.5.1"
     readable-stream "^2.3.0"
 
-streamroller@^1.0.6:
-  version "1.0.6"
-  resolved "https://registry.yarnpkg.com/streamroller/-/streamroller-1.0.6.tgz#8167d8496ed9f19f05ee4b158d9611321b8cacd9"
-  integrity sha512-3QC47Mhv3/aZNFpDDVO44qQb9gwB9QggMEE0sQmkTAwBVYdBRWISdsywlkfm5II1Q5y/pmrHflti/IgmIzdDBg==
-  dependencies:
-    async "^2.6.2"
-    date-format "^2.0.0"
-    debug "^3.2.6"
-    fs-extra "^7.0.1"
-    lodash "^4.17.14"
-
 string-width@^1.0.1, string-width@^1.0.2:
   version "1.0.2"
   resolved "https://registry.yarnpkg.com/string-width/-/string-width-1.0.2.tgz#118bdf5b8cdc51a2a7e70d211e07e2b0b9b107d3"