diff --git a/app.js b/app.js
index 4958336..272c9c1 100644
--- a/app.js
+++ b/app.js
@@ -1,31 +1,43 @@
-const express = require('express');
-const path = require('path');
-const bodyParser = require('body-parser');
-const cors = require('cors');
-const mongoose = require('mongoose');
+const express = require("express");
+const path = require("path");
+const bodyParser = require("body-parser");
+const cors = require("cors");
+const mongoose = require("mongoose");
 const port = process.env.PORT || 4000;
-const publicDomain = process.env.PUBLIC_DOMAIN || 'http://localhost:3000'
+const publicDomain = process.env.PUBLIC_DOMAIN || "http://localhost:3000";
 
-const config = require('./config/db');
+const config = require("./config/db");
 
 const app = express();
 
 mongoose.Promise = global.Promise;
-mongoose.connect(config.DB).then(
-  () => {console.log('Database is connected') },
-  err => { console.log('Can not connect to the database'+ err)}
-);
+mongoose
+  // Added parameters to solve warnings on console.
+  .connect(config.DB, { useNewUrlParser: true, useUnifiedTopology: true })
+  .then(
+    () => {
+      console.log("Database is connected 🎉");
+    },
+    (err) => {
+      console.log("Can not connect to the database" + err);
+    }
+  );
+
+// Added to solve warnings on console.
+mongoose.set("useFindAndModify", false);
 
-const todoRoute = require('./routes/todoRoute');
+const todoRoute = require("./routes/todoRoute");
 
 app.use(bodyParser.json());
-app.use(cors({
-  credentials: true,
-  origin: [publicDomain]
-}));
+app.use(
+  cors({
+    credentials: true,
+    origin: [publicDomain],
+  })
+);
 
-app.use('/api/v1', todoRoute);
+app.use("/api/v1", todoRoute);
 
-const server = app.listen(port, function(){
-  console.log('Listening on port ' + port);
+const server = app.listen(port, function () {
+  console.log("Listening on port " + port + "💻");
 });
diff --git a/models/Todo.js b/models/Todo.js
index a97880d..77084fa 100644
--- a/models/Todo.js
+++ b/models/Todo.js
@@ -1,14 +1,21 @@
-const mongoose = require('mongoose');
+// Model of Todo modified (added creator to it).
+
+const mongoose = require("mongoose");
 const Schema = mongoose.Schema;
 
-let Todo = new Schema({
-  title: {
-    type: String
+let Todo = new Schema(
+  {
+    creator: {
+      type: String,
+    },
+    title: {
+      type: String,
+    },
+    message: {
+      type: String,
+    },
   },
-  body: {
-    type: String
-  }
-},{ timestamps: true }
+  { timestamps: true }
 );
 
-module.exports = mongoose.model('Todo', Todo);
\ No newline at end of file
+module.exports = mongoose.model("Todo", Todo);
diff --git a/routes/todoRoute.js b/routes/todoRoute.js
index 57ea4e4..745ceab 100644
--- a/routes/todoRoute.js
+++ b/routes/todoRoute.js
@@ -1,12 +1,12 @@
-const express = require('express');
-const TodoController = require('../todosController/todos');
+const express = require("express");
+const TodoController = require("../todosController/todos");
 
 const router = express.Router();
 
-router.get('/todos', TodoController.getAllTodos);
-router.get('/todos/:id', TodoController.getTodo);
-router.post('/todos', TodoController.createTodo);
-router.put('/todos/:id', TodoController.updateTodo);
-router.delete('/todos/:id', TodoController.deleteTodo);
+router.get("/todos", TodoController.getAllTodos);
+router.get("/todos/:id", TodoController.getTodo);
+router.post("/todos", TodoController.createTodo);
+router.put("/todos/:id", TodoController.updateTodo);
+router.delete("/todos/:id", TodoController.deleteTodo);
 
-module.exports = router;
\ No newline at end of file
+module.exports = router;