diff --git a/package-lock.json b/package-lock.json
index da891f27..aa3f0f93 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4,22 +4,12 @@
   "lockfileVersion": 1,
   "requires": true,
   "dependencies": {
-    "@adonisjs/dev-utils": {
-      "version": "1.4.0",
-      "resolved": "https://registry.npmjs.org/@adonisjs/dev-utils/-/dev-utils-1.4.0.tgz",
-      "integrity": "sha512-uzgy6VOMQ2LTlI6I0RGuXPCfsEsWoIv1E49869ETzvHG78zm9CTNskKxmLBzfklhC+borLLLa+2dwgMUpGty8w==",
-      "dev": true,
-      "requires": {
-        "clear-module": "^3.2.0",
-        "fs-extra": "^7.0.1"
-      }
-    },
     "@adonisjs/fold": {
-      "version": "6.0.2",
-      "resolved": "https://registry.npmjs.org/@adonisjs/fold/-/fold-6.0.2.tgz",
-      "integrity": "sha512-hBV7CUe9Kk5u5X3cK7X8Cg8mu1MIR2pOnLto7ZDzrICll4cBS1tKFGskkaZS+cMy0R7/yOx1Nqj25tCqw6DIXw==",
+      "version": "6.0.3",
+      "resolved": "https://registry.npmjs.org/@adonisjs/fold/-/fold-6.0.3.tgz",
+      "integrity": "sha512-TO8TkVjTIFyq2pjjlIRzPSICi27nlFg9D0YGCSeGIm18xvW6s/3lWMrobOiMRgLKnAvuxdGR8YeGKbAN4xE1Bg==",
       "requires": {
-        "@poppinss/utils": "^1.0.1"
+        "@poppinss/utils": "^1.0.2"
       }
     },
     "@adonisjs/mrm-preset": {
@@ -89,37 +79,74 @@
       "dev": true
     },
     "@poppinss/application": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/@poppinss/application/-/application-1.0.2.tgz",
-      "integrity": "sha512-28Fx+i8rDgiUZ17EF4KeI0K9+wcMVTMQqFpm1c04m3wsvkquL+ZDbKmGBMulgs0iy38yV4RySt9V3WMhrcZcgA==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@poppinss/application/-/application-1.0.3.tgz",
+      "integrity": "sha512-cSzXPN73R5h9BLAOgd3fD+Z6xeIeSS+MPRz16WVacRZaZIn3SPUYmbpTqQ8dlZnfzCDgwO7Gn6pSaYwMl57+gQ==",
       "requires": {
-        "@poppinss/utils": "^1.0.1"
+        "@poppinss/utils": "^1.0.1",
+        "@types/semver": "^6.0.0",
+        "semver": "^6.1.1"
+      },
+      "dependencies": {
+        "semver": {
+          "version": "6.1.1",
+          "resolved": "https://registry.npmjs.org/semver/-/semver-6.1.1.tgz",
+          "integrity": "sha512-rWYq2e5iYW+fFe/oPPtYJxYgjBm8sC4rmoGdUOgBB7VnwKt6HrL793l2voH1UlsyYZpJ4g0wfjnTEO1s1NP2eQ=="
+        }
       }
     },
     "@poppinss/config": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@poppinss/config/-/config-1.0.4.tgz",
-      "integrity": "sha512-28AZtDxNpvUGmhqBXsk5uJwpqOVR5nfZ1gFSWqSySAMXIUjLqxqyVs1F5xrDM87n5dyLurIXXRBvfd/d3tLdLw==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@poppinss/config/-/config-1.0.5.tgz",
+      "integrity": "sha512-cJ0XEa9G+Z2vqxmPfgtcvJGPVCzTFWEk1QTyeld0ql7anyJI6zkhFEWOus2A+SNgRy1z/JthO+ab8Ydx719mgg==",
       "requires": {
         "@types/lodash": "^4.14.126",
         "lodash": "^4.17.11"
       }
     },
     "@poppinss/cookie": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/@poppinss/cookie/-/cookie-1.0.0.tgz",
-      "integrity": "sha512-JbpiETNSHPI43Q7UDvb5h6Yo+o+rQ3XGVfZlmpytQS2sc89JFSpda2pV+8yawh/GsVRjECEydCLv4MfSAykjEA==",
+      "version": "1.0.1",
+      "resolved": "https://registry.npmjs.org/@poppinss/cookie/-/cookie-1.0.1.tgz",
+      "integrity": "sha512-izHO2Fx8H8OdEKX2MyVknAW5BKQsUBlu7ttLwHWWlv2utgcCti0aWQE+Zp5B0/n4Zsm02htegOaogzi5BwvnhA==",
       "requires": {
-        "cookie": "^0.3.1",
+        "cookie": "^0.4.0",
         "cookie-signature": "^1.1.0"
+      },
+      "dependencies": {
+        "cookie": {
+          "version": "0.4.0",
+          "resolved": "https://registry.npmjs.org/cookie/-/cookie-0.4.0.tgz",
+          "integrity": "sha512-+Hp8fLp57wnUSt0tY0tHEXh4voZRDnoIrZPqlo3DPiI4y9lwg/jqx+1Om94/W6ZaPDOUbnjOt/99w66zk+l1Xg=="
+        }
+      }
+    },
+    "@poppinss/dev-utils": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@poppinss/dev-utils/-/dev-utils-1.0.0.tgz",
+      "integrity": "sha512-Pgx3mtjKOJokOZKhs9vDvkEfAmJ/0jqxnZSdhjjnV6FWb/wIVrbuPN2Ag42DgGqd7fYb4LmKIOErI0jFaVpmPw==",
+      "requires": {
+        "clear-module": "^3.2.0",
+        "fs-extra": "^8.0.1"
+      },
+      "dependencies": {
+        "fs-extra": {
+          "version": "8.0.1",
+          "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.0.1.tgz",
+          "integrity": "sha512-W+XLrggcDzlle47X/XnS7FXrXu9sDo+Ze9zpndeBxdgv88FHLm1HtmkhEwavruS6koanBjp098rUpHs65EmG7A==",
+          "requires": {
+            "graceful-fs": "^4.1.2",
+            "jsonfile": "^4.0.0",
+            "universalify": "^0.1.0"
+          }
+        }
       }
     },
     "@poppinss/env": {
-      "version": "1.0.4",
-      "resolved": "https://registry.npmjs.org/@poppinss/env/-/env-1.0.4.tgz",
-      "integrity": "sha512-5rRlKJ39shNj3VgycQMC8EKhSQkyxd0ZiRxTovBv3uNdJNdKc3Y3k1+79LfylUeb6ZrETkn03S4d1vQ+OaT1BA==",
+      "version": "1.0.5",
+      "resolved": "https://registry.npmjs.org/@poppinss/env/-/env-1.0.5.tgz",
+      "integrity": "sha512-AuKBplPvxwWuwtg2+cr6gR9EAkFGGoEWY1V+tbKdeNoSbq5AY0D67RDqOF/WAqSj6rXN3VdvVqmE20ii14M13g==",
       "requires": {
-        "@poppinss/utils": "^1.0.0",
+        "@poppinss/utils": "^1.0.1",
         "dotenv": "^8.0.0"
       }
     },
@@ -143,13 +170,13 @@
       }
     },
     "@poppinss/http-server": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/@poppinss/http-server/-/http-server-1.1.3.tgz",
-      "integrity": "sha512-STntP4uKOJ1ss+xBn3CLOCl/Mj7eMnNe0BPjuIKe3tAo1LGxGwUyCs4Y8AX/lGK4LRfgzDVNy0HBpW08GqJRtA==",
+      "version": "1.1.5",
+      "resolved": "https://registry.npmjs.org/@poppinss/http-server/-/http-server-1.1.5.tgz",
+      "integrity": "sha512-/MfCQJQduJtjFM64ULAqPSdFqkJ3MGAiJ+wdLkLATelsh/3swAeUeVcUiw8yaU40THIaRMw3tHPzu/wpvgppYQ==",
       "requires": {
-        "@poppinss/request": "^1.0.8",
-        "@poppinss/response": "^1.0.7",
-        "@poppinss/utils": "^1.0.1",
+        "@poppinss/request": "^1.0.9",
+        "@poppinss/response": "^1.0.8",
+        "@poppinss/utils": "^1.0.3",
         "co-compose": "^5.1.1",
         "haye": "^2.0.2",
         "lodash": "^4.17.11",
@@ -159,21 +186,21 @@
       }
     },
     "@poppinss/logger": {
-      "version": "1.0.5",
-      "resolved": "https://registry.npmjs.org/@poppinss/logger/-/logger-1.0.5.tgz",
-      "integrity": "sha512-jz42uoqNOFpg7bv5SsTLEvtosf3IQueyP6DpNNflW40BDwVRXjx1pxiQwvnBsxpF87OIhR3CB05zACv8OHAeqA==",
+      "version": "1.1.0",
+      "resolved": "https://registry.npmjs.org/@poppinss/logger/-/logger-1.1.0.tgz",
+      "integrity": "sha512-ozKu+fpUEbGx1/H0sUgGswAeR9FL+yAFSItYr7KXKTQ0CLWH963pHDWyg9ED11E6pM+qtQWg1GnjTAFFXRiwiQ==",
       "requires": {
         "@types/pino": "^5.8.7",
-        "pino": "^5.12.5",
+        "pino": "^5.12.6",
         "ts-essentials": "^2.0.7"
       }
     },
     "@poppinss/request": {
-      "version": "1.0.8",
-      "resolved": "https://registry.npmjs.org/@poppinss/request/-/request-1.0.8.tgz",
-      "integrity": "sha512-D9OmrpDBQaDb4jsrzWMg8W5Wdwv4OUYtTstAECCneUwh9vEsGRtiBKf7FzMgY8k0v6xWiORSsg13gX/Ix2b2ZA==",
+      "version": "1.0.9",
+      "resolved": "https://registry.npmjs.org/@poppinss/request/-/request-1.0.9.tgz",
+      "integrity": "sha512-oTB/GVgrBnacRNeRGv0T7+DxqJKacYNDWwpnnlBG+XSnYn2PEnzvwS6UMpykE15vbiCAKKkJ1cvSOPzWiI6oNg==",
       "requires": {
-        "@poppinss/cookie": "^1.0.0",
+        "@poppinss/cookie": "^1.0.1",
         "accepts": "^1.3.7",
         "cuid": "^2.1.6",
         "fresh": "^0.5.2",
@@ -197,11 +224,12 @@
       }
     },
     "@poppinss/response": {
-      "version": "1.0.7",
-      "resolved": "https://registry.npmjs.org/@poppinss/response/-/response-1.0.7.tgz",
-      "integrity": "sha512-uMOvy5A9DYmS3F8U3fbZasRTlnx5LLTlZb1/XZMK8X9FvX9ZyS1dRR1OEwVQY7sqQXf3iF51y5ofKVdtw0BZiw==",
+      "version": "1.0.8",
+      "resolved": "https://registry.npmjs.org/@poppinss/response/-/response-1.0.8.tgz",
+      "integrity": "sha512-SaVkCY9Jc4q9GEEdhL0gQvQnTXHXI9Pk5kuF0DgRC4Kc29JoK6JLInl9RmGcXuE2fXtdftO3KvTdi2ewBaDe2g==",
       "requires": {
-        "@poppinss/cookie": "^1.0.0",
+        "@poppinss/cookie": "^1.0.1",
+        "@poppinss/dev-utils": "^1.0.0",
         "content-disposition": "^0.5.3",
         "destroy": "^1.0.4",
         "etag": "^1.8.1",
@@ -213,9 +241,9 @@
       }
     },
     "@poppinss/utils": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/@poppinss/utils/-/utils-1.0.1.tgz",
-      "integrity": "sha512-YIGAReqyObGCxq6kE4JGeJOvNQ6Vrys3IjwDA5yJx4c6y0IQNLIPd91ee+P63Q0JMoUNLsaRYplnLrjhnVbS8g==",
+      "version": "1.0.3",
+      "resolved": "https://registry.npmjs.org/@poppinss/utils/-/utils-1.0.3.tgz",
+      "integrity": "sha512-NSTyS9r8QLDzxdC7fWfw/S8uc1pLQ3O+TF1GrKzu2SxUDYZE8s2YK+k1BNDbfVCVeCijNj8RXv3NgsmeWQrIlw==",
       "requires": {
         "require-all": "^3.0.0"
       }
@@ -311,9 +339,9 @@
       "dev": true
     },
     "@types/node": {
-      "version": "12.0.2",
-      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.2.tgz",
-      "integrity": "sha512-5tabW/i+9mhrfEOUcLDu2xBPsHJ+X5Orqy9FKpale3SjDA17j5AEpYq5vfy3oAeAHGcvANRCO3NV3d2D6q3NiA=="
+      "version": "12.0.3",
+      "resolved": "https://registry.npmjs.org/@types/node/-/node-12.0.3.tgz",
+      "integrity": "sha512-zkOxCS/fA+3SsdA+9Yun0iANxzhQRiNwTvJSr6N95JhuJ/x27z9G2URx1Jpt3zYFfCGUXZGL5UDxt5eyLE7wgw=="
     },
     "@types/normalize-package-data": {
       "version": "2.4.0",
@@ -330,6 +358,11 @@
         "@types/sonic-boom": "*"
       }
     },
+    "@types/semver": {
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/@types/semver/-/semver-6.0.0.tgz",
+      "integrity": "sha512-OO0srjOGH99a4LUN2its3+r6CBYcplhJ466yLqs+zvAWgphCpS8hYZEZ797tRDP/QKcqTdb/YCN6ifASoAWkrQ=="
+    },
     "@types/sonic-boom": {
       "version": "0.6.2",
       "resolved": "https://registry.npmjs.org/@types/sonic-boom/-/sonic-boom-0.6.2.tgz",
@@ -765,19 +798,20 @@
       "dev": true
     },
     "camelcase-keys": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-2.1.0.tgz",
-      "integrity": "sha1-MIvur/3ygRkFHvodkyITyRuPkuc=",
+      "version": "4.2.0",
+      "resolved": "https://registry.npmjs.org/camelcase-keys/-/camelcase-keys-4.2.0.tgz",
+      "integrity": "sha1-oqpfsa9oh1glnDLBQUJteJI7m3c=",
       "dev": true,
       "requires": {
-        "camelcase": "^2.0.0",
-        "map-obj": "^1.0.0"
+        "camelcase": "^4.1.0",
+        "map-obj": "^2.0.0",
+        "quick-lru": "^1.0.0"
       },
       "dependencies": {
-        "camelcase": {
-          "version": "2.1.1",
-          "resolved": "https://registry.npmjs.org/camelcase/-/camelcase-2.1.1.tgz",
-          "integrity": "sha1-fB0W1nmhu+WcoCys7PsBHiAfWh8=",
+        "map-obj": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/map-obj/-/map-obj-2.0.0.tgz",
+          "integrity": "sha1-plzSkIepJZi4eRJXpSPgISIqwfk=",
           "dev": true
         }
       }
@@ -875,7 +909,6 @@
       "version": "3.2.0",
       "resolved": "https://registry.npmjs.org/clear-module/-/clear-module-3.2.0.tgz",
       "integrity": "sha512-5uO4iiezdJX/jozvfsXnMgWh/hTgOpXMeVqLfYe9RVUIajH/bU7xF9yvDVTq9JGUrBNefitISqd7rJ8jENgj/g==",
-      "dev": true,
       "requires": {
         "parent-module": "^1.0.1",
         "resolve-from": "^4.0.0"
@@ -884,8 +917,7 @@
         "resolve-from": {
           "version": "4.0.0",
           "resolved": "https://registry.npmjs.org/resolve-from/-/resolve-from-4.0.0.tgz",
-          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g==",
-          "dev": true
+          "integrity": "sha512-pb/MYmXstAkysRFx8piNI1tGFNQIFA3vkE3Gq4EuA1dF6gHp/+vgZqsCGJapvy8N3Q+4o7FwvquPJcnZ7RYy4g=="
         }
       }
     },
@@ -1369,28 +1401,36 @@
       }
     },
     "del": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/del/-/del-3.0.0.tgz",
-      "integrity": "sha1-U+z2mf/LyzljdpGrE7rxYIGXZuU=",
+      "version": "4.1.1",
+      "resolved": "https://registry.npmjs.org/del/-/del-4.1.1.tgz",
+      "integrity": "sha512-QwGuEUouP2kVwQenAsOof5Fv8K9t3D8Ca8NxcXKrIpEHjTXK5J2nXLdP+ALI1cgv8wj7KuwBhTwBkOZSJKM5XQ==",
       "dev": true,
       "requires": {
+        "@types/glob": "^7.1.1",
         "globby": "^6.1.0",
-        "is-path-cwd": "^1.0.0",
-        "is-path-in-cwd": "^1.0.0",
-        "p-map": "^1.1.1",
-        "pify": "^3.0.0",
-        "rimraf": "^2.2.8"
+        "is-path-cwd": "^2.0.0",
+        "is-path-in-cwd": "^2.0.0",
+        "p-map": "^2.0.0",
+        "pify": "^4.0.1",
+        "rimraf": "^2.6.3"
+      },
+      "dependencies": {
+        "pify": {
+          "version": "4.0.1",
+          "resolved": "https://registry.npmjs.org/pify/-/pify-4.0.1.tgz",
+          "integrity": "sha512-uB80kBFb/tfd68bVleG9T5GGsGPjJrLAUpR5PZIrhBnIaRTQRjqdJSsIKkOP6OAIFbj7GOrcudc5pNjZ+geV2g==",
+          "dev": true
+        }
       }
     },
     "del-cli": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/del-cli/-/del-cli-1.1.0.tgz",
-      "integrity": "sha1-J1V9aaC335ncuqHjSgnmrGWR0sQ=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/del-cli/-/del-cli-2.0.0.tgz",
+      "integrity": "sha512-IREsO6mjSTxxvWLKMMUi1G0izhqEBx7qeDkOJ6H3+TJl8gQl6x5C5hK4Sm1GJ51KodUMR6O7HuIhnF24Edua3g==",
       "dev": true,
       "requires": {
-        "del": "^3.0.0",
-        "meow": "^3.6.0",
-        "update-notifier": "^2.1.0"
+        "del": "^4.1.1",
+        "meow": "^5.0.0"
       }
     },
     "delayed-stream": {
@@ -1930,12 +1970,6 @@
       "integrity": "sha1-6td0q+5y4gQJQzoGY2YCPdaIekE=",
       "dev": true
     },
-    "get-stdin": {
-      "version": "4.0.1",
-      "resolved": "https://registry.npmjs.org/get-stdin/-/get-stdin-4.0.1.tgz",
-      "integrity": "sha1-uWjGsKBDhDJJAui/Gl3zJXmkUP4=",
-      "dev": true
-    },
     "get-stream": {
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-3.0.0.tgz",
@@ -2103,8 +2137,7 @@
     "graceful-fs": {
       "version": "4.1.15",
       "resolved": "https://registry.npmjs.org/graceful-fs/-/graceful-fs-4.1.15.tgz",
-      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA==",
-      "dev": true
+      "integrity": "sha512-6uHUhOPEBgQ24HM+r6b/QwWfZq+yiFcipKFrOFiBEnWdy5sdzYoi+pJeQaPI5qOLRFqWmAXUPQNsielzdLoecA=="
     },
     "has-ansi": {
       "version": "2.0.0",
@@ -2346,13 +2379,10 @@
       "dev": true
     },
     "indent-string": {
-      "version": "2.1.0",
-      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-2.1.0.tgz",
-      "integrity": "sha1-ji1INIdCEhtKghi3oTfppSBJ3IA=",
-      "dev": true,
-      "requires": {
-        "repeating": "^2.0.0"
-      }
+      "version": "3.2.0",
+      "resolved": "https://registry.npmjs.org/indent-string/-/indent-string-3.2.0.tgz",
+      "integrity": "sha1-Sl/W0nzDMvN+VBmlBNu4NxBckok=",
+      "dev": true
     },
     "inflight": {
       "version": "1.0.6",
@@ -2527,15 +2557,6 @@
       "integrity": "sha1-qIwCU1eR8C7TfHahueqXc8gz+MI=",
       "dev": true
     },
-    "is-finite": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/is-finite/-/is-finite-1.0.2.tgz",
-      "integrity": "sha1-zGZ3aVYCvlUO8R6LSqYwU0K20Ko=",
-      "dev": true,
-      "requires": {
-        "number-is-nan": "^1.0.0"
-      }
-    },
     "is-fullwidth-code-point": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/is-fullwidth-code-point/-/is-fullwidth-code-point-2.0.0.tgz",
@@ -2609,18 +2630,29 @@
       }
     },
     "is-path-cwd": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-1.0.0.tgz",
-      "integrity": "sha1-0iXsIxMuie3Tj9p2dHLmLmXxEG0=",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-cwd/-/is-path-cwd-2.1.0.tgz",
+      "integrity": "sha512-Sc5j3/YnM8tDeyCsVeKlm/0p95075DyLmDEIkSgQ7mXkrOX+uTCtmQFm0CYzVyJwcCCmO3k8qfJt17SxQwB5Zw==",
       "dev": true
     },
     "is-path-in-cwd": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-1.0.1.tgz",
-      "integrity": "sha512-FjV1RTW48E7CWM7eE/J2NJvAEEVektecDBVBE5Hh3nM1Jd0kvhHtX68Pr3xsDf857xt3Y4AkwVULK1Vku62aaQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/is-path-in-cwd/-/is-path-in-cwd-2.1.0.tgz",
+      "integrity": "sha512-rNocXHgipO+rvnP6dk3zI20RpOtrAM/kzbB258Uw5BWr3TpXi861yzjo16Dn4hUox07iw5AyeMLHWsujkjzvRQ==",
       "dev": true,
       "requires": {
-        "is-path-inside": "^1.0.0"
+        "is-path-inside": "^2.1.0"
+      },
+      "dependencies": {
+        "is-path-inside": {
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/is-path-inside/-/is-path-inside-2.1.0.tgz",
+          "integrity": "sha512-wiyhTzfDWsvwAW53OBWF5zuvaOGlZ6PwYxAbPVDhpm+gM09xKQGjBq/8uYN12aDvMxnAnq3dxTyoSoRNmg5YFg==",
+          "dev": true,
+          "requires": {
+            "path-is-inside": "^1.0.2"
+          }
+        }
       }
     },
     "is-path-inside": {
@@ -2817,7 +2849,6 @@
       "version": "4.0.0",
       "resolved": "https://registry.npmjs.org/jsonfile/-/jsonfile-4.0.0.tgz",
       "integrity": "sha1-h3Gq4HmbZAdrdmQPygWPnBDjPss=",
-      "dev": true,
       "requires": {
         "graceful-fs": "^4.1.6"
       }
@@ -3061,33 +3092,15 @@
       }
     },
     "load-json-file": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-1.1.0.tgz",
-      "integrity": "sha1-lWkFcI1YtLq0wiYbBPWfMcmTdMA=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/load-json-file/-/load-json-file-4.0.0.tgz",
+      "integrity": "sha1-L19Fq5HjMhYjT9U62rZo607AmTs=",
       "dev": true,
       "requires": {
         "graceful-fs": "^4.1.2",
-        "parse-json": "^2.2.0",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0",
-        "strip-bom": "^2.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        },
-        "strip-bom": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/strip-bom/-/strip-bom-2.0.0.tgz",
-          "integrity": "sha1-YhmoVhZSBJHzV4i9vxRHqZx+aw4=",
-          "dev": true,
-          "requires": {
-            "is-utf8": "^0.2.0"
-          }
-        }
+        "parse-json": "^4.0.0",
+        "pify": "^3.0.0",
+        "strip-bom": "^3.0.0"
       }
     },
     "locate-path": {
@@ -3260,21 +3273,20 @@
       }
     },
     "meow": {
-      "version": "3.7.0",
-      "resolved": "https://registry.npmjs.org/meow/-/meow-3.7.0.tgz",
-      "integrity": "sha1-cstmi0JSKCkKu/qFaJJYcwioAfs=",
+      "version": "5.0.0",
+      "resolved": "https://registry.npmjs.org/meow/-/meow-5.0.0.tgz",
+      "integrity": "sha512-CbTqYU17ABaLefO8vCU153ZZlprKYWDljcndKKDCFcYQITzWCXZAVk4QMFZPgvzrnUQ3uItnIE/LoUOwrT15Ig==",
       "dev": true,
       "requires": {
-        "camelcase-keys": "^2.0.0",
-        "decamelize": "^1.1.2",
+        "camelcase-keys": "^4.0.0",
+        "decamelize-keys": "^1.0.0",
         "loud-rejection": "^1.0.0",
-        "map-obj": "^1.0.1",
-        "minimist": "^1.1.3",
+        "minimist-options": "^3.0.1",
         "normalize-package-data": "^2.3.4",
-        "object-assign": "^4.0.1",
-        "read-pkg-up": "^1.0.1",
-        "redent": "^1.0.0",
-        "trim-newlines": "^1.0.0"
+        "read-pkg-up": "^3.0.0",
+        "redent": "^2.0.0",
+        "trim-newlines": "^2.0.0",
+        "yargs-parser": "^10.0.0"
       }
     },
     "merge": {
@@ -4458,9 +4470,9 @@
       }
     },
     "p-map": {
-      "version": "1.2.0",
-      "resolved": "https://registry.npmjs.org/p-map/-/p-map-1.2.0.tgz",
-      "integrity": "sha512-r6zKACMNhjPJMTl8KcFH4li//gkrXWfbD6feV8l6doRHlzljFWGJ2AP6iKaCJXyZmAUMOPtvbW7EXkbWO/pLEA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/p-map/-/p-map-2.1.0.tgz",
+      "integrity": "sha512-y3b8Kpd8OAN444hxfBbFfj1FY/RjtTd8tzYwhUqNYXx0fXx2iX4maP4Qr6qhIKbQXI02wTLAda4fYUbDagTUFw==",
       "dev": true
     },
     "p-memoize": {
@@ -4520,7 +4532,6 @@
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/parent-module/-/parent-module-1.0.1.tgz",
       "integrity": "sha512-GQ2EWRpQV8/o+Aw8YqtfZZPfNRWZYkbidE9k5rpl/hC3vtHHBfGm2Ifi6qWV+coDGkrUKZAxE3Lot5kcsRlh+g==",
-      "dev": true,
       "requires": {
         "callsites": "^3.0.0"
       },
@@ -4528,8 +4539,7 @@
         "callsites": {
           "version": "3.1.0",
           "resolved": "https://registry.npmjs.org/callsites/-/callsites-3.1.0.tgz",
-          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ==",
-          "dev": true
+          "integrity": "sha512-P8BjAsXvZS+VIDUI11hHCQEv74YT67YUi5JJFNWIqL235sBmjX4+qx9Muvls5ivyNENctx46xQLQ3aTuE7ssaQ=="
         }
       }
     },
@@ -4566,12 +4576,13 @@
       "dev": true
     },
     "parse-json": {
-      "version": "2.2.0",
-      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-2.2.0.tgz",
-      "integrity": "sha1-9ID0BDTvgHQfhGkJn43qGPVaTck=",
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/parse-json/-/parse-json-4.0.0.tgz",
+      "integrity": "sha1-vjX1Qlvh9/bHRxhPmKeIy5lHfuA=",
       "dev": true,
       "requires": {
-        "error-ex": "^1.2.0"
+        "error-ex": "^1.3.1",
+        "json-parse-better-errors": "^1.0.1"
       }
     },
     "parse-passwd": {
@@ -4623,22 +4634,12 @@
       "dev": true
     },
     "path-type": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/path-type/-/path-type-1.1.0.tgz",
-      "integrity": "sha1-WcRPfuSR2nBNpBXaWkBwuk+P5EE=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/path-type/-/path-type-3.0.0.tgz",
+      "integrity": "sha512-T2ZUsdZFHgA3u4e5PfPbjd7HDDpxPnQb5jN0SrDsjNSuVXHJqtwTnWqG0B1jZrgmJ/7lj1EmVIByWt1gxGkWvg==",
       "dev": true,
       "requires": {
-        "graceful-fs": "^4.1.2",
-        "pify": "^2.0.0",
-        "pinkie-promise": "^2.0.0"
-      },
-      "dependencies": {
-        "pify": {
-          "version": "2.3.0",
-          "resolved": "https://registry.npmjs.org/pify/-/pify-2.3.0.tgz",
-          "integrity": "sha1-7RQaasBDqEnqWISY59yosVMw6Qw=",
-          "dev": true
-        }
+        "pify": "^3.0.0"
       }
     },
     "pathval": {
@@ -4682,9 +4683,9 @@
       }
     },
     "pino-std-serializers": {
-      "version": "2.4.1",
-      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.4.1.tgz",
-      "integrity": "sha512-v/JglhO0aFcvkMV9VUxhgyuJo8K1si857Ww86Tx8H2cjC/kp0ndzzcF6Vbxr4RgKFYJdHfLVpEuD55znMZuxnw=="
+      "version": "2.4.2",
+      "resolved": "https://registry.npmjs.org/pino-std-serializers/-/pino-std-serializers-2.4.2.tgz",
+      "integrity": "sha512-WaL504dO8eGs+vrK+j4BuQQq6GLKeCCcHaMB2ItygzVURcL1CycwNEUHTD/lHFHs/NL5qAz2UKrjYWXKSf4aMQ=="
     },
     "pkg-dir": {
       "version": "4.2.0",
@@ -4824,44 +4825,68 @@
       }
     },
     "read-pkg": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-1.1.0.tgz",
-      "integrity": "sha1-9f+qXs0pyzHAR0vKfXVra7KePyg=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg/-/read-pkg-3.0.0.tgz",
+      "integrity": "sha1-nLxoaXj+5l0WwA4rGcI3/Pbjg4k=",
       "dev": true,
       "requires": {
-        "load-json-file": "^1.0.0",
+        "load-json-file": "^4.0.0",
         "normalize-package-data": "^2.3.2",
-        "path-type": "^1.0.0"
+        "path-type": "^3.0.0"
       }
     },
     "read-pkg-up": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-1.0.1.tgz",
-      "integrity": "sha1-nWPBMnbAZZGNV/ACpX9AobZD+wI=",
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/read-pkg-up/-/read-pkg-up-3.0.0.tgz",
+      "integrity": "sha1-PtSWaF26D4/hGNBpHcUfSh/5bwc=",
       "dev": true,
       "requires": {
-        "find-up": "^1.0.0",
-        "read-pkg": "^1.0.0"
+        "find-up": "^2.0.0",
+        "read-pkg": "^3.0.0"
       },
       "dependencies": {
         "find-up": {
-          "version": "1.1.2",
-          "resolved": "https://registry.npmjs.org/find-up/-/find-up-1.1.2.tgz",
-          "integrity": "sha1-ay6YIrGizgpgq2TWEOzK1TyyTQ8=",
+          "version": "2.1.0",
+          "resolved": "https://registry.npmjs.org/find-up/-/find-up-2.1.0.tgz",
+          "integrity": "sha1-RdG35QbHF93UgndaK3eSCjwMV6c=",
           "dev": true,
           "requires": {
-            "path-exists": "^2.0.0",
-            "pinkie-promise": "^2.0.0"
+            "locate-path": "^2.0.0"
           }
         },
-        "path-exists": {
-          "version": "2.1.0",
-          "resolved": "https://registry.npmjs.org/path-exists/-/path-exists-2.1.0.tgz",
-          "integrity": "sha1-D+tsZPD8UY2adU3V77YscCJ2H0s=",
+        "locate-path": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/locate-path/-/locate-path-2.0.0.tgz",
+          "integrity": "sha1-K1aLJl7slExtnA3pw9u7ygNUzY4=",
+          "dev": true,
+          "requires": {
+            "p-locate": "^2.0.0",
+            "path-exists": "^3.0.0"
+          }
+        },
+        "p-limit": {
+          "version": "1.3.0",
+          "resolved": "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz",
+          "integrity": "sha512-vvcXsLAJ9Dr5rQOPk7toZQZJApBl2K4J6dANSsEuh6QI41JYcsS/qhTGa9ErIUUgK3WNQoJYvylxvjqmiqEA9Q==",
+          "dev": true,
+          "requires": {
+            "p-try": "^1.0.0"
+          }
+        },
+        "p-locate": {
+          "version": "2.0.0",
+          "resolved": "https://registry.npmjs.org/p-locate/-/p-locate-2.0.0.tgz",
+          "integrity": "sha1-IKAQOyIqcMj9OcwuWAaA893l7EM=",
           "dev": true,
           "requires": {
-            "pinkie-promise": "^2.0.0"
+            "p-limit": "^1.1.0"
           }
+        },
+        "p-try": {
+          "version": "1.0.0",
+          "resolved": "https://registry.npmjs.org/p-try/-/p-try-1.0.0.tgz",
+          "integrity": "sha1-y8ec26+P1CKOE/Yh8rGiN8GyB7M=",
+          "dev": true
         }
       }
     },
@@ -4918,13 +4943,13 @@
       }
     },
     "redent": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/redent/-/redent-1.0.0.tgz",
-      "integrity": "sha1-z5Fqsf1fHxbfsggi3W7H9zDCr94=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/redent/-/redent-2.0.0.tgz",
+      "integrity": "sha1-wbIAe0LVfrE4kHmzyDM2OdXhzKo=",
       "dev": true,
       "requires": {
-        "indent-string": "^2.1.0",
-        "strip-indent": "^1.0.1"
+        "indent-string": "^3.0.0",
+        "strip-indent": "^2.0.0"
       }
     },
     "regex-not": {
@@ -5031,15 +5056,6 @@
       "integrity": "sha1-jcrkcOHIirwtYA//Sndihtp15jc=",
       "dev": true
     },
-    "repeating": {
-      "version": "2.0.1",
-      "resolved": "https://registry.npmjs.org/repeating/-/repeating-2.0.1.tgz",
-      "integrity": "sha1-UhTFOpJtNVJwdSf7q0FdvAjQbdo=",
-      "dev": true,
-      "requires": {
-        "is-finite": "^1.0.0"
-      }
-    },
     "replace-ext": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/replace-ext/-/replace-ext-1.0.0.tgz",
@@ -5659,13 +5675,10 @@
       "dev": true
     },
     "strip-indent": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-1.0.1.tgz",
-      "integrity": "sha1-DHlipq3vp7vUrDZkYKY4VSrhoKI=",
-      "dev": true,
-      "requires": {
-        "get-stdin": "^4.0.1"
-      }
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/strip-indent/-/strip-indent-2.0.0.tgz",
+      "integrity": "sha1-XvjbKV0B5u1sv3qrlpmNeCJSe2g=",
+      "dev": true
     },
     "strip-json-comments": {
       "version": "2.0.1",
@@ -5881,9 +5894,9 @@
       "dev": true
     },
     "trim-newlines": {
-      "version": "1.0.0",
-      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-1.0.0.tgz",
-      "integrity": "sha1-WIeWa7WCpFA6QetST301ARgVphM=",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/trim-newlines/-/trim-newlines-2.0.0.tgz",
+      "integrity": "sha1-tAPQuRvlDDMd/EuC7s6yLD3hbSA=",
       "dev": true
     },
     "trim-trailing-lines": {
@@ -6018,9 +6031,9 @@
       }
     },
     "typescript": {
-      "version": "3.4.5",
-      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.5.tgz",
-      "integrity": "sha512-YycBxUb49UUhdNMU5aJ7z5Ej2XGmaIBL0x34vZ82fn3hGvD+bgrMrVDpatgz2f7YxUMJxMkbWxJZeAvDxVe7Vw==",
+      "version": "3.5.1",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.5.1.tgz",
+      "integrity": "sha512-64HkdiRv1yYZsSe4xC1WVgamNigVYjlssIoaH2HcZF0+ijsk5YK2g0G34w9wJkze8+5ow4STd22AynfO6ZYYLw==",
       "dev": true
     },
     "underscore": {
@@ -6145,8 +6158,7 @@
     "universalify": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/universalify/-/universalify-0.1.2.tgz",
-      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg==",
-      "dev": true
+      "integrity": "sha512-rBJeI5CXAlmy1pV+617WB9J63U6XcazHHF2f2dbJix4XzpUF0RS3Zbj0FGIOCAva5P/d/GBOYaACQ1w+0azUkg=="
     },
     "unset-value": {
       "version": "1.0.0",
diff --git a/package.json b/package.json
index b9ac604d..1f86e8e7 100644
--- a/package.json
+++ b/package.json
@@ -39,12 +39,12 @@
   },
   "homepage": "https://github.com/adonisjs/adonis-framework#readme",
   "devDependencies": {
-    "@adonisjs/dev-utils": "^1.4.0",
     "@adonisjs/mrm-preset": "^2.0.3",
-    "@types/node": "^12.0.2",
+    "@poppinss/dev-utils": "^1.0.0",
+    "@types/node": "^12.0.3",
     "commitizen": "^3.1.1",
     "cz-conventional-changelog": "^2.1.0",
-    "del-cli": "^1.1.0",
+    "del-cli": "^2.0.0",
     "doctoc": "^1.4.0",
     "husky": "^2.3.0",
     "japa": "^2.0.10",
@@ -54,7 +54,7 @@
     "ts-node": "^8.2.0",
     "tslint": "^5.16.0",
     "tslint-eslint-rules": "^5.4.0",
-    "typescript": "^3.4.5"
+    "typescript": "^3.5.1"
   },
   "nyc": {
     "exclude": [
@@ -76,16 +76,16 @@
     }
   },
   "dependencies": {
-    "@adonisjs/fold": "^6.0.2",
-    "@poppinss/application": "^1.0.2",
-    "@poppinss/config": "^1.0.4",
-    "@poppinss/env": "^1.0.4",
+    "@adonisjs/fold": "^6.0.3",
+    "@poppinss/application": "^1.0.3",
+    "@poppinss/config": "^1.0.5",
+    "@poppinss/env": "^1.0.5",
     "@poppinss/events": "^1.0.0",
-    "@poppinss/http-server": "^1.1.3",
-    "@poppinss/logger": "^1.0.5",
-    "@poppinss/request": "^1.0.8",
-    "@poppinss/response": "^1.0.7",
-    "@poppinss/utils": "^1.0.1",
+    "@poppinss/http-server": "^1.1.5",
+    "@poppinss/logger": "^1.1.0",
+    "@poppinss/request": "^1.0.9",
+    "@poppinss/response": "^1.0.8",
+    "@poppinss/utils": "^1.0.3",
     "find-package-json": "^1.2.0",
     "simple-encryptor": "^3.0.0",
     "youch": "^2.0.10",
diff --git a/providers/AppProvider.ts b/providers/AppProvider.ts
index c3c88f19..55058695 100644
--- a/providers/AppProvider.ts
+++ b/providers/AppProvider.ts
@@ -12,7 +12,7 @@ import { Config } from '@poppinss/config'
 import { Request } from '@poppinss/request'
 import { IocContract } from '@adonisjs/fold'
 import { Response } from '@poppinss/response'
-import { getLogger } from '@poppinss/logger'
+import { Logger } from '@poppinss/logger'
 import { requireAll } from '@poppinss/utils'
 import { ApplicationContract } from '@poppinss/application'
 import { Emitter } from '@poppinss/events'
@@ -52,7 +52,7 @@ export default class AppProvider {
    */
   protected $registerLogger () {
     this.$container.singleton('Adonis/Core/Logger', () => {
-      return getLogger(this.$container.use('Adonis/Core/Config').get('app.logger', {}))
+      return new Logger(this.$container.use('Adonis/Core/Config').get('app.logger', {}))
     })
   }
 
diff --git a/src/Ignitor/index.ts b/src/Ignitor/index.ts
index d51033ae..c07e1d2c 100644
--- a/src/Ignitor/index.ts
+++ b/src/Ignitor/index.ts
@@ -52,12 +52,12 @@ export class Ignitor {
     const ioc = new Ioc()
 
     /**
-     * Defining `use` and `make` globals to ease the process
-     * of resolving container dependencies.
+     * Adding IoC container resolver methods to the globals.
      */
-    global['use'] = ioc.use.bind(ioc)
-    global['make'] = ioc.make.bind(ioc)
-    global['useEsm'] = ioc.useEsm.bind(ioc)
+    global[Symbol.for('ioc.use')] = ioc.use.bind(ioc)
+    global[Symbol.for('ioc.make')] = ioc.make.bind(ioc)
+    global[Symbol.for('ioc.call')] = ioc.call.bind(ioc)
+    global[Symbol.for('ioc.useEsm')] = ioc.useEsm.bind(ioc)
 
     /**
      * The package file is required to read the version of `@adonisjs/core`
@@ -74,7 +74,7 @@ export class Ignitor {
     /**
      * Setting up the application
      */
-    this.application = new Application(pkgVersion, this._appRoot, ioc, rcContents)
+    this.application = new Application(this._appRoot, ioc, rcContents, pkgVersion)
 
     /**
      * For now we hardcode the envirnonment to web. Later this will change after
diff --git a/test/exception-handler.spec.ts b/test/exception-handler.spec.ts
index dff99049..5d454280 100644
--- a/test/exception-handler.spec.ts
+++ b/test/exception-handler.spec.ts
@@ -9,7 +9,7 @@
 
 import * as test from 'japa'
 import { Exception } from '@poppinss/utils'
-import { getFakeLogger } from '@poppinss/logger'
+import { FakeLogger } from '@poppinss/logger'
 import { HttpContext } from '@poppinss/http-server'
 
 import { HttpExceptionHandler } from '../src/HttpExceptionHandler'
@@ -27,7 +27,7 @@ test.group('HttpExceptionHandler', () => {
       protected dontReport = ['E_BAD_REQUEST']
     }
 
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
@@ -39,7 +39,7 @@ test.group('HttpExceptionHandler', () => {
   test('report error when not inside ignore list', (assert) => {
     class AppHandler extends HttpExceptionHandler {
     }
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
@@ -61,7 +61,7 @@ test.group('HttpExceptionHandler', () => {
       protected dontReport = []
     }
 
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
@@ -76,7 +76,7 @@ test.group('HttpExceptionHandler', () => {
         return { username: 'virk' }
       }
     }
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
@@ -108,7 +108,7 @@ test.group('HttpExceptionHandler', () => {
       }
     }
 
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
@@ -125,7 +125,7 @@ test.group('HttpExceptionHandler', () => {
     class InvalidAuth extends Exception {
     }
 
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
@@ -146,7 +146,7 @@ test.group('HttpExceptionHandler', () => {
     class InvalidAuth extends Exception {
     }
 
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
@@ -168,7 +168,7 @@ test.group('HttpExceptionHandler', () => {
     class InvalidAuth extends Exception {
     }
 
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
@@ -192,7 +192,7 @@ test.group('HttpExceptionHandler', () => {
     class InvalidAuth extends Exception {
     }
 
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
@@ -220,7 +220,7 @@ test.group('HttpExceptionHandler', () => {
       }
     }
 
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
@@ -243,7 +243,7 @@ test.group('HttpExceptionHandler', () => {
       }
     }
 
-    const logger = getFakeLogger(loggerConfig)
+    const logger = new FakeLogger(loggerConfig)
     const handler = new AppHandler(logger)
 
     const ctx = HttpContext.create('/', {})
diff --git a/test/ignitor.spec.ts b/test/ignitor.spec.ts
index 7f45f372..d66aad17 100644
--- a/test/ignitor.spec.ts
+++ b/test/ignitor.spec.ts
@@ -10,7 +10,7 @@
 import { join } from 'path'
 import * as test from 'japa'
 import { createServer } from 'http'
-import { Filesystem } from '@adonisjs/dev-utils'
+import { Filesystem } from '@poppinss/dev-utils'
 import * as supertest from 'supertest'
 import { Ignitor } from '../src/Ignitor'
 
@@ -24,6 +24,7 @@ test.group('Ignitor', (group) => {
   group.after(async () => {
     await fs.cleanup()
     delete process.env.ENV_SILENT
+    delete process.env.APP_KEY
   })
 
   group.afterEach(async () => {
@@ -42,11 +43,11 @@ test.group('Ignitor', (group) => {
     ]`)
 
     await fs.add(`config/app.ts`, `
-      const Env = global['use']('Adonis/Core/Env')
+      const Env = global[Symbol.for('ioc.use')]('Adonis/Core/Env')
       export const appKey = Env.get('APP_KEY')
     `)
 
-    await fs.addEnv(`.env`, { APP_KEY: 'foo' })
+    await fs.add(`.env`, `APP_KEY=foo`)
 
     const ignitor = new Ignitor(fs.basePath)
     await ignitor.bootstrap()
@@ -89,7 +90,7 @@ test.group('Ignitor', (group) => {
     ]`)
 
     await fs.add(`start/route.ts`, `
-      const Config = global['use']('Adonis/Core/Config')
+      const Config = global[Symbol.for('ioc.use')]('Adonis/Core/Config')
       Config.set('routeLoaded', true)
     `)
 
@@ -114,7 +115,7 @@ test.group('Ignitor', (group) => {
     ]`)
 
     await fs.add(`start/route.ts`, `
-      const Config = global['use']('Adonis/Core/Config')
+      const Config = global[Symbol.for('ioc.use')]('Adonis/Core/Config')
       Config.set('routeLoaded', true)
     `)