diff --git a/ANAConversationPlatform/ANAConversationPlatform.csproj b/ANAConversationPlatform/ANAConversationPlatform.csproj
index c0eea9d..2ffe558 100644
--- a/ANAConversationPlatform/ANAConversationPlatform.csproj
+++ b/ANAConversationPlatform/ANAConversationPlatform.csproj
@@ -7,13 +7,13 @@
 
   <ItemGroup>
     <Compile Remove="Logs\**" />
+    <Compile Remove="wwwroot\ChatMedia\**" />
     <Content Remove="Logs\**" />
+    <Content Remove="wwwroot\ChatMedia\**" />
     <EmbeddedResource Remove="Logs\**" />
+    <EmbeddedResource Remove="wwwroot\ChatMedia\**" />
     <None Remove="Logs\**" />
-  </ItemGroup>
-
-  <ItemGroup>
-    <Folder Include="wwwroot\ChatMedia\" />
+    <None Remove="wwwroot\ChatMedia\**" />
   </ItemGroup>
   <ItemGroup>
     <PackageReference Include="AWSSDK.S3" Version="3.3.6.1" />
diff --git a/ANAConversationPlatform/Controllers/ConversationController.cs b/ANAConversationPlatform/Controllers/ConversationController.cs
index 6334098..60f6232 100644
--- a/ANAConversationPlatform/Controllers/ConversationController.cs
+++ b/ANAConversationPlatform/Controllers/ConversationController.cs
@@ -7,6 +7,7 @@
 using ANAConversationPlatform.Models;
 using ANAConversationPlatform.Models.Sections;
 using Microsoft.Extensions.Logging;
+using static ANAConversationPlatform.Helpers.Constants;
 
 namespace ANAConversationPlatform.Controllers
 {
@@ -23,16 +24,23 @@ public ConversationController(ILogger<ConversationController> log)
         [HttpGet]
         public ActionResult Chat()
         {
-            var chatNodes = MongoHelper.RetrieveRecordsFromChatNode();
-            Debug.WriteLine(chatNodes.ToJson());
-            if (chatNodes == null || chatNodes.Count == 0)
-                return Ok(new object[] { });
+            try
+            {
+                var chatNodes = MongoHelper.RetrieveRecordsFromChatNode();
+                if (chatNodes == null || chatNodes.Count == 0)
+                    return Ok(new object[] { });
 
-            return Json(chatNodes, new JsonSerializerSettings()
+                return Json(chatNodes, new JsonSerializerSettings()
+                {
+                    NullValueHandling = NullValueHandling.Ignore,
+                    Converters = new List<JsonConverter> { new CustomStringEnumConverter() }
+                });
+            }
+            catch (System.Exception ex)
             {
-                NullValueHandling = NullValueHandling.Ignore,
-                Converters = new List<JsonConverter> { new CustomStringEnumConverter() }
-            });
+                _log.LogError(new EventId((int)LoggerEventId.CHAT_ACTION_ERROR), ex, ex.Message);
+                return StatusCode(500, new { Message = ex.Message });
+            }
         }
 
         [HttpGet]
@@ -45,75 +53,83 @@ public ActionResult RefreshContent()
         [HttpGet]
         public ActionResult HybridChat()
         {
-            var chatNodes = MongoHelper.RetrieveRecordsFromChatNode();
+            try
+            {
+                var chatNodes = MongoHelper.RetrieveRecordsFromChatNode();
 
-            chatNodes.AddRange(new[] {
-                new ChatNode("INIT_CHAT_NODE")
-                {
-                    ApiMethod = "GET",
-                    ApiUrl = Url.Action("CreateUserSessionForHChat", "AgentChat", new { }, Request.Scheme),
-                    Emotion = EmotionEnum.Cool,
-                    Name = "Send Chat Text Node",
-                    NodeType = NodeTypeEnum.ApiCall,
-                    NextNodeId = "SEND_CHAT_HISTORY_TO_SERVER",
-                    RequiredVariables = new[] { "DEVICE_ID", "PERSON_NAME" },
-                },
-                new ChatNode("SEND_CHAT_HISTORY_TO_SERVER")
-                {
-                    ApiMethod = "POST",
-                    ApiUrl = Url.Action("SubmitHistory", "AgentChat", new { }, Request.Scheme),
-                    Emotion = EmotionEnum.Cool,
-                    Name = "Send Chat History To Server",
-                    NodeType = NodeTypeEnum.ApiCall,
-                    NextNodeId = "GET_CHAT_TEXT_NODE",
-                    RequiredVariables = new[] { "CHAT_USER_ID", "CHAT_USER_TOKEN", "DEVICE_ID", "AGENT", "HISTORY" },
-                },
-                new ChatNode("GET_CHAT_TEXT_NODE")
+                chatNodes.AddRange(new[]
                 {
-                    Buttons = new List<Button>(new[]{
-                        new Button("NEW BTN ID", "ChatText", "Send", EmotionEnum.Cool, ButtonTypeEnum.GetText, "SEND_CHAT_TEXT_NODE", false, false)
-                    }),
-                    Emotion = EmotionEnum.Cool,
-                    Name = "Chat Input",
-                    NodeType = NodeTypeEnum.Combination,
-                    Sections = new List<Section>(),
-                    TimeoutInMs = 0,
-                    VariableName = "TEXT"
-                },
-                new ChatNode("SEND_CHAT_TEXT_NODE")
-                {
-                    ApiMethod = "GET",
-                    ApiUrl = Url.Action("UserInput", "AgentChat", new { }, Request.Scheme),
-                    Buttons = null,
-                    Emotion = EmotionEnum.Cool,
-                    Name = "Send Chat Text Node",
-                    NodeType = NodeTypeEnum.ApiCall,
-                    NextNodeId = "CONTINUE_CHAT_NODE",
-                    RequiredVariables = new[] { "CHAT_USER_ID", "CHAT_USER_TOKEN", "AGENT", "TEXT" },
-                },
-                new ChatNode("CONTINUE_CHAT_NODE")
-                {
-                    Buttons = new List<Button>(new[]{
-                        new Button("NEW BTN ID", "ChatText", "Send", EmotionEnum.Cool, ButtonTypeEnum.GetText, "SEND_CHAT_TEXT_NODE", false, false)
-                    }),
-                    Emotion = EmotionEnum.Cool,
-                    Name = "Chat Input Continue",
-                    NodeType = NodeTypeEnum.Combination,
-                    Sections = new List<Section>(),
-                    TimeoutInMs = 0,
-                    VariableName = "TEXT"
-                }
-            });
+                    new ChatNode("INIT_CHAT_NODE")
+                    {
+                        ApiMethod = "GET",
+                        ApiUrl = Url.Action("CreateUserSessionForHChat", "AgentChat", new { }, Request.Scheme),
+                        Emotion = EmotionEnum.Cool,
+                        Name = "Send Chat Text Node",
+                        NodeType = NodeTypeEnum.ApiCall,
+                        NextNodeId = "SEND_CHAT_HISTORY_TO_SERVER",
+                        RequiredVariables = new[] { "DEVICE_ID", "PERSON_NAME" },
+                    },
+                    new ChatNode("SEND_CHAT_HISTORY_TO_SERVER")
+                    {
+                        ApiMethod = "POST",
+                        ApiUrl = Url.Action("SubmitHistory", "AgentChat", new { }, Request.Scheme),
+                        Emotion = EmotionEnum.Cool,
+                        Name = "Send Chat History To Server",
+                        NodeType = NodeTypeEnum.ApiCall,
+                        NextNodeId = "GET_CHAT_TEXT_NODE",
+                        RequiredVariables = new[] { "CHAT_USER_ID", "CHAT_USER_TOKEN", "DEVICE_ID", "AGENT", "HISTORY" },
+                    },
+                    new ChatNode("GET_CHAT_TEXT_NODE")
+                    {
+                        Buttons = new List<Button>(new[]{
+                            new Button("NEW BTN ID", "ChatText", "Send", EmotionEnum.Cool, ButtonTypeEnum.GetText, "SEND_CHAT_TEXT_NODE", false, false)
+                        }),
+                        Emotion = EmotionEnum.Cool,
+                        Name = "Chat Input",
+                        NodeType = NodeTypeEnum.Combination,
+                        Sections = new List<Section>(),
+                        TimeoutInMs = 0,
+                        VariableName = "TEXT"
+                    },
+                    new ChatNode("SEND_CHAT_TEXT_NODE")
+                    {
+                        ApiMethod = "GET",
+                        ApiUrl = Url.Action("UserInput", "AgentChat", new { }, Request.Scheme),
+                        Buttons = null,
+                        Emotion = EmotionEnum.Cool,
+                        Name = "Send Chat Text Node",
+                        NodeType = NodeTypeEnum.ApiCall,
+                        NextNodeId = "CONTINUE_CHAT_NODE",
+                        RequiredVariables = new[] { "CHAT_USER_ID", "CHAT_USER_TOKEN", "AGENT", "TEXT" },
+                    },
+                    new ChatNode("CONTINUE_CHAT_NODE")
+                    {
+                        Buttons = new List<Button>(new[]{
+                            new Button("NEW BTN ID", "ChatText", "Send", EmotionEnum.Cool, ButtonTypeEnum.GetText, "SEND_CHAT_TEXT_NODE", false, false)
+                        }),
+                        Emotion = EmotionEnum.Cool,
+                        Name = "Chat Input Continue",
+                        NodeType = NodeTypeEnum.Combination,
+                        Sections = new List<Section>(),
+                        TimeoutInMs = 0,
+                        VariableName = "TEXT"
+                    }
+                });
 
-            if (chatNodes == null || chatNodes.Count == 0)
-                return Ok(new object[] { });
+                if (chatNodes == null || chatNodes.Count == 0)
+                    return Ok(new object[] { });
 
-            return Json(chatNodes, new JsonSerializerSettings()
+                return Json(chatNodes, new JsonSerializerSettings()
+                {
+                    NullValueHandling = NullValueHandling.Ignore,
+                    Converters = new List<JsonConverter> { new CustomStringEnumConverter() }
+                });
+            }
+            catch (System.Exception ex)
             {
-                NullValueHandling = NullValueHandling.Ignore,
-                Converters = new List<JsonConverter> { new CustomStringEnumConverter() }
-            });
+                _log.LogError(new EventId((int)LoggerEventId.HYBRID_CHAT_ACTION_ERROR), ex, ex.Message);
+                return StatusCode(500, new { Message = ex.Message });
+            }
         }
-
     }
 }
\ No newline at end of file
diff --git a/ANAConversationPlatform/Controllers/StudioDistController.cs b/ANAConversationPlatform/Controllers/StudioDistController.cs
new file mode 100644
index 0000000..4e715a3
--- /dev/null
+++ b/ANAConversationPlatform/Controllers/StudioDistController.cs
@@ -0,0 +1,54 @@
+using System;
+using System.Linq;
+using Microsoft.AspNetCore.Mvc;
+using ANAConversationPlatform.Helpers;
+using System.IO;
+
+namespace ANAConversationPlatform.Controllers
+{
+    [Produces("application/json")]
+    public class StudioDistController : Controller
+    {
+        [HttpGet]
+        public ActionResult Latest()
+        {
+            if (!string.IsNullOrWhiteSpace(Utils.Settings?.StudioDistFolder))
+            {
+                Version v;
+                var fileVersions = Directory.EnumerateFiles(Utils.Settings?.StudioDistFolder)
+                    .Where(x => Version.TryParse(Path.GetFileNameWithoutExtension(x), out v))
+                    .Select(x => Version.Parse(Path.GetFileNameWithoutExtension(x))).ToList();
+
+                if (fileVersions.Count > 0)
+                {
+                    var latest = fileVersions.OrderByDescending(x => x).First();
+                    return Ok(new
+                    {
+                        DownloadLink = Url.Link(nameof(StudioDownload), new { version = latest.ToString() }),
+                        Version = latest
+                    });
+                }
+            }
+            return BadRequest("Studio Distribution Status Unknown");
+        }
+
+        [HttpGet]
+        [Route(nameof(StudioDownload), Name = nameof(StudioDownload))]
+        public ActionResult StudioDownload(string version)
+        {
+            try
+            {
+                var v = Version.Parse(version);
+                var fileName = Path.Combine(Utils.Settings.StudioDistFolder, v.ToString() + ".zip");
+                if (System.IO.File.Exists(fileName))
+                    return File(System.IO.File.OpenRead(fileName), "application/zip", Path.GetFileName(fileName));
+                else
+                    return NotFound();
+            }
+            catch (Exception ex)
+            {
+                return BadRequest(ex.Message);
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/ANAConversationPlatform/Helpers/Constants.cs b/ANAConversationPlatform/Helpers/Constants.cs
index 33e7299..10afa70 100644
--- a/ANAConversationPlatform/Helpers/Constants.cs
+++ b/ANAConversationPlatform/Helpers/Constants.cs
@@ -3,7 +3,6 @@
     public static class Constants
     {
         public const string CHAT_MEDIA_FOLDER_NAME = "ChatMedia";
-
         public enum LoggerEventId
         {
             ROCKET_CHAT_SDK_INIT_ERROR = 0,
@@ -11,7 +10,10 @@ public enum LoggerEventId
             AGENT_CHAT_CREATE_USER_ERR = 2,
             AGENT_CHAT_CALLBACK_RECEIVED_ERR = 3,
             AGENT_CHAT_FIND_AGENT_ERR = 4,
-            AGENT_CHAT_CREATE_USER = 5
+            AGENT_CHAT_CREATE_USER = 5,
+            MONGO_HELPER_ERROR = 6,
+            CHAT_ACTION_ERROR = 7,
+            HYBRID_CHAT_ACTION_ERROR = 8,
         }
     }
 }
diff --git a/ANAConversationPlatform/Helpers/Extensions.cs b/ANAConversationPlatform/Helpers/Extensions.cs
index 9799d15..105f1b9 100644
--- a/ANAConversationPlatform/Helpers/Extensions.cs
+++ b/ANAConversationPlatform/Helpers/Extensions.cs
@@ -11,24 +11,36 @@ namespace ANAConversationPlatform.Helpers
 {
     public static class Extensions
     {
-        public static Content GetFor(this List<Content> contentCollection, ChatNode node)
+        public static Content GetFor(this IEnumerable<Content> contentCollection, ChatNode node)
         {
             if (string.IsNullOrWhiteSpace(node.Id)) return null;
             return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.NodeId) && x.NodeId == node.Id);
         }
 
-        public static Content GetFor(this List<Content> contentCollection, Section section)
+        public static Content GetFor(this IEnumerable<Content> contentCollection, Section section)
         {
             if (string.IsNullOrWhiteSpace(section._id)) return null;
             return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.SectionId) && x.SectionId == section._id);
         }
 
-        public static Content GetFor(this List<Content> contentCollection, Button btn)
+        public static Content GetFor(this IEnumerable<Content> contentCollection, CarouselItem carouselItem)
+        {
+            if (string.IsNullOrWhiteSpace(carouselItem._id)) return null;
+            return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.CarouselItemId) && x.CarouselItemId == carouselItem._id);
+        }
+
+        public static Content GetFor(this IEnumerable<Content> contentCollection, CarouselButton carouselBtn)
+        {
+            if (string.IsNullOrWhiteSpace(carouselBtn._id)) return null;
+            return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.CarouselButtonId) && x.CarouselButtonId == carouselBtn._id);
+        }
+
+        public static Content GetFor(this IEnumerable<Content> contentCollection, Button btn)
         {
             if (string.IsNullOrWhiteSpace(btn._id)) return null;
             return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.ButtonId) && x.ButtonId == btn._id);
         }
-        public static Content GetFor(this List<Content> contentCollection, Coordinates coordiates)
+        public static Content GetFor(this IEnumerable<Content> contentCollection, Coordinates coordiates)
         {
             if (string.IsNullOrWhiteSpace(coordiates.CoordinateListId)) return null;
             return contentCollection.FirstOrDefault(x => !string.IsNullOrWhiteSpace(x.ButtonId) && x.ButtonId == coordiates.CoordinateListId);
diff --git a/ANAConversationPlatform/Helpers/MongoHelper.cs b/ANAConversationPlatform/Helpers/MongoHelper.cs
index 9123fa1..e80e3e2 100644
--- a/ANAConversationPlatform/Helpers/MongoHelper.cs
+++ b/ANAConversationPlatform/Helpers/MongoHelper.cs
@@ -10,6 +10,11 @@
 using System.Diagnostics;
 using System.Linq;
 using ANAConversationPlatform.Models.Activity;
+using System.Threading.Tasks;
+using System.Collections.Concurrent;
+using ANAConversationPlatform.Controllers;
+using Microsoft.Extensions.Logging;
+using static ANAConversationPlatform.Helpers.Constants;
 
 namespace ANAConversationPlatform.Helpers
 {
@@ -19,6 +24,7 @@ static MongoHelper()
         {
             ConventionRegistry.Register(typeof(IgnoreExtraElementsConvention).Name, new ConventionPack { new IgnoreExtraElementsConvention(true) }, t => true);
         }
+        public static ILogger Logger { get; set; }
 
         public static DatabaseConnectionSettings Settings { get; set; }
 
@@ -40,19 +46,14 @@ private static IMongoDatabase ChatDB
             }
         }
 
-        private static List<Content> _contents;
-        private static List<Content> Contents
+        private static ConcurrentBag<Content> _contents;
+        private static ConcurrentBag<Content> Contents
         {
             get
             {
-                if (Settings.CacheContent)
-                {
-                    if (_contents == null)
-                        _contents = GetContentCollection();
-                    return _contents;
-                }
-                else
-                    return GetContentCollection();
+                if (_contents == null)
+                    _contents = new ConcurrentBag<Content>(GetContentCollection());
+                return _contents;
             }
         }
 
@@ -60,26 +61,23 @@ private static List<Content> Contents
 
         public static void RefreshContentInMemory()
         {
-            _contents = GetContentCollection();
+            _contents = new ConcurrentBag<Content>(GetContentCollection());
         }
 
         public static List<ChatNode> RetrieveRecordsFromChatNode()
         {
             try
             {
-                var nodeTemplateCollection = ChatDB.GetCollection<BsonDocument>(Settings.TemplateCollectionName);
+                if (!Settings.CacheContent)
+                    RefreshContentInMemory();
 
-                // Creating Filter for Date Range Greater than Equal to Start Date and Less than End Date
-                FilterDefinitionBuilder<BsonDocument> builder = Builders<BsonDocument>.Filter;
-
-                var filter = new BsonDocument();
-                List<BsonDocument> nodeList;
+                var nodeTemplateCollection = ChatDB.GetCollection<BsonDocument>(Settings.TemplateCollectionName);
 
                 // Retrieving records, if no/invalid limit is specified then all records are retrieved otherwise records as per specified limit and offset are retrieved
-                nodeList = nodeTemplateCollection.Find(filter).Project(Builders<BsonDocument>.Projection.Exclude("Sections._t").Exclude("Buttons._t")).ToList();
+                var nodeList = nodeTemplateCollection.Find(new BsonDocument()).Project(Builders<BsonDocument>.Projection.Exclude("Sections._t").Exclude("Buttons._t")).ToList();
 
-                List<ChatNode> chatNodes = new List<ChatNode>();
-                foreach (BsonDocument node in nodeList)
+                var chatNodes = new ConcurrentBag<ChatNode>();
+                Parallel.ForEach(nodeList, node =>
                 {
                     try
                     {
@@ -88,9 +86,6 @@ public static List<ChatNode> RetrieveRecordsFromChatNode()
                         chatNode.Sections = new List<Section>();
                         chatNode.Buttons = new List<Button>();
 
-                        //Adding Header Text
-                        Content nodeContent = Contents.GetFor(chatNode);
-
                         BsonArray sectionBsonArray = node.GetValue("Sections").AsBsonArray;
                         foreach (BsonDocument sectionBsonDocument in sectionBsonArray)
                         {
@@ -107,30 +102,33 @@ public static List<ChatNode> RetrieveRecordsFromChatNode()
                             btn.ButtonText = buttonContent?.ButtonText;
                             chatNode.Buttons.Add(btn);
                         }
-
-                        if (node.Contains("IsStartNode") && node["IsStartNode"] != null && (bool)node["IsStartNode"])
-                            chatNodes.Insert(0, chatNode);
-                        else
-                            chatNodes.Add(chatNode);
+                        chatNodes.Add(chatNode);
                     }
-                    catch (Exception e)
+                    catch (Exception ex)
                     {
-                        Debug.WriteLine(e);
+                        Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "RetrieveRecordsFromChatNode Error: {0}", ex.Message);
                     }
+                });
+
+                var startNode = chatNodes.FirstOrDefault(x => x.IsStartNode);
+                if (startNode != null) //If start chat node is present, move it up
+                {
+                    var result = chatNodes.Where(x => x != startNode).ToList();
+                    result.Insert(0, startNode);
+                    return result;
                 }
-                return chatNodes;
+                return chatNodes.ToList();
             }
-            catch (Exception e)
+            catch (Exception ex)
             {
-                Debug.WriteLine(e.Message + "\n" + e.StackTrace);
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "RetrieveRecordsFromChatNode Error: {0}", ex.Message);
             }
             return null;
         }
 
+        static Random rand = new Random();
         private static Section GetSection(BsonDocument sectionBsonDocument)
         {
-            Random rnd = new Random();
-
             Section sectObj;
 
             string sectionType = sectionBsonDocument.GetValue("SectionType")?.ToString();
@@ -145,72 +143,75 @@ private static Section GetSection(BsonDocument sectionBsonDocument)
                         imgSectObj.Title = imgContent.Title;
                         imgSectObj.Caption = imgContent.Caption;
                     }
-
                     sectObj = imgSectObj;
-
                     break;
 
                 case "text":
                     TextSection textSectObj = BsonSerializer.Deserialize<TextSection>(sectionBsonDocument);
                     Content textContent = Contents.GetFor(textSectObj);
                     if (textContent != null)
+                    {
                         textSectObj.Text = textContent.SectionText;
+                        if (textSectObj.DelayInMs == 0)
+                            textSectObj.DelayInMs = Math.Min(Utils.Settings.MaxCapTimeTakenToType, textSectObj.Text.Length * (Utils.Settings.BaseTimeTakenToTypePerChar + rand.Next(0, Utils.Settings.VariableTimeTakenToTypePerChar)));
+                    }
                     sectObj = textSectObj;
                     break;
 
                 case "graph":
-
-                    GraphSection gphObj = BsonSerializer.Deserialize<GraphSection>(sectionBsonDocument);
-
-                    Content docContent = Contents.GetFor(gphObj);
-                    if (docContent != null)
                     {
-                        gphObj.Caption = docContent.Caption;
-
-                        gphObj.X.Label = docContent.XLabel;
-                        gphObj.Y.Label = docContent.YLabel;
-                    }
-                    gphObj.CoordinatesSet = new List<Coordinates>();
-                    BsonArray coordinateSetBsonArray = sectionBsonDocument.GetValue("CoordinatesSet").AsBsonArray;
+                        GraphSection gphObj = BsonSerializer.Deserialize<GraphSection>(sectionBsonDocument);
 
-
-                    if (coordinateSetBsonArray != null)
-                        foreach (BsonDocument coordinateSetBsonDoc in coordinateSetBsonArray)
+                        Content docContent = Contents.GetFor(gphObj);
+                        if (docContent != null)
                         {
-                            var coordinateListId = coordinateSetBsonDoc.GetValue("CoordinateListId")?.ToString();
-                            if (!string.IsNullOrWhiteSpace(coordinateListId))
-                                continue;
+                            gphObj.Caption = docContent.Caption;
 
-                            var coordinatesObj = new Coordinates()
-                            {
-                                CoordinateListId = coordinateListId
-                            };
+                            gphObj.X.Label = docContent.XLabel;
+                            gphObj.Y.Label = docContent.YLabel;
+                        }
+                        gphObj.CoordinatesSet = new List<Coordinates>();
+                        BsonArray coordinateSetBsonArray = sectionBsonDocument.GetValue("CoordinatesSet").AsBsonArray;
 
-                            var coordinateContent = Contents.GetFor(coordinatesObj);
-                            coordinatesObj.LegendName = coordinateContent?.CoordinateListLegend;
 
-                            if (coordinateSetBsonDoc.TryGetValue("CoordinateList", out BsonValue tempCoordinateList))
+                        if (coordinateSetBsonArray != null)
+                            foreach (BsonDocument coordinateSetBsonDoc in coordinateSetBsonArray)
                             {
-                                BsonArray coordinateListBsonArray = tempCoordinateList?.AsBsonArray;
-                                if (coordinateListBsonArray != null)
-                                    foreach (BsonDocument coordinateBsonDoc in coordinateListBsonArray)
-                                    {
-                                        string x = coordinateBsonDoc.GetValue("X")?.AsString;
-                                        string y = coordinateBsonDoc.GetValue("Y")?.AsString;
-
-                                        string coordinateText = coordinateContent?.CoordinateText;
-
-                                        if (string.IsNullOrWhiteSpace(coordinateText))
-                                            coordinatesObj.AddXYCoordinates(x, y);
-                                        else
-                                            coordinatesObj.AddXYCoordinates(x, y, coordinateText);
-
-                                        Debug.WriteLine(coordinatesObj.ToJson());
-                                    }
+                                var coordinateListId = coordinateSetBsonDoc.GetValue("CoordinateListId")?.ToString();
+                                if (!string.IsNullOrWhiteSpace(coordinateListId))
+                                    continue;
+
+                                var coordinatesObj = new Coordinates()
+                                {
+                                    CoordinateListId = coordinateListId
+                                };
+
+                                var coordinateContent = Contents.GetFor(coordinatesObj);
+                                coordinatesObj.LegendName = coordinateContent?.CoordinateListLegend;
+
+                                if (coordinateSetBsonDoc.TryGetValue("CoordinateList", out BsonValue tempCoordinateList))
+                                {
+                                    BsonArray coordinateListBsonArray = tempCoordinateList?.AsBsonArray;
+                                    if (coordinateListBsonArray != null)
+                                        foreach (BsonDocument coordinateBsonDoc in coordinateListBsonArray)
+                                        {
+                                            string x = coordinateBsonDoc.GetValue("X")?.AsString;
+                                            string y = coordinateBsonDoc.GetValue("Y")?.AsString;
+
+                                            string coordinateText = coordinateContent?.CoordinateText;
+
+                                            if (string.IsNullOrWhiteSpace(coordinateText))
+                                                coordinatesObj.AddXYCoordinates(x, y);
+                                            else
+                                                coordinatesObj.AddXYCoordinates(x, y, coordinateText);
+
+                                            Debug.WriteLine(coordinatesObj.ToJson());
+                                        }
+                                }
+                                gphObj.CoordinatesSet.Add(coordinatesObj);
                             }
-                            gphObj.CoordinatesSet.Add(coordinatesObj);
-                        }
-                    sectObj = gphObj;
+                        sectObj = gphObj;
+                    }
 
                     break;
 
@@ -264,6 +265,37 @@ private static Section GetSection(BsonDocument sectionBsonDocument)
                     sectObj = embeddedHtmlObj;
                     break;
 
+                case "carousel":
+                    var carouselObj = BsonSerializer.Deserialize<CarouselSection>(sectionBsonDocument);
+                    var carContent = Contents.GetFor(carouselObj);
+                    if (carContent != null)
+                    {
+                        carouselObj.Title = carContent.Title;
+                        carouselObj.Caption = carContent.Caption;
+                    }
+                    if (carouselObj.Items != null)
+                        foreach (var carItem in carouselObj.Items)
+                        {
+                            var content = Contents.GetFor(carItem);
+                            if (content != null)
+                            {
+                                carItem.Title = content.Title;
+                                carItem.Caption = content.Caption;
+                            }
+                            if (carItem.Buttons != null)
+                                foreach (var carBtn in carItem.Buttons)
+                                {
+                                    var carBtnContent = Contents.GetFor(carBtn);
+                                    carBtn.Text = carBtnContent?.ButtonText;
+                                }
+                        }
+                    sectObj = carouselObj;
+                    break;
+                case "printotp":
+                    PrintOTPSection printOTPSection = BsonSerializer.Deserialize<PrintOTPSection>(sectionBsonDocument);
+                    //No content to load for Section Type: PrintOTP
+                    sectObj = printOTPSection;
+                    break;
                 default:
                     sectObj = null;
                     break;
@@ -273,11 +305,18 @@ private static Section GetSection(BsonDocument sectionBsonDocument)
 
         public static void InsertActivityEvent(ChatActivityEvent activityEvent)
         {
-            if (activityEvent != null && string.IsNullOrWhiteSpace(activityEvent._id))
-                activityEvent._id = ObjectId.GenerateNewId().ToString();
+            try
+            {
+                if (activityEvent != null && string.IsNullOrWhiteSpace(activityEvent._id))
+                    activityEvent._id = ObjectId.GenerateNewId().ToString();
 
-            var coll = ChatDB.GetCollection<ChatActivityEvent>(Settings.ActivityEventLogCollectionName);
-            coll.InsertOne(activityEvent);
+                var coll = ChatDB.GetCollection<ChatActivityEvent>(Settings.ActivityEventLogCollectionName);
+                coll.InsertOne(activityEvent);
+            }
+            catch (Exception ex)
+            {
+                Logger.LogError(new EventId((int)LoggerEventId.MONGO_HELPER_ERROR), ex, "InsertActivityEvent: {0}", ex.Message);
+            }
         }
     }
 }
\ No newline at end of file
diff --git a/ANAConversationPlatform/Helpers/Utils.cs b/ANAConversationPlatform/Helpers/Utils.cs
new file mode 100644
index 0000000..c8e0ebc
--- /dev/null
+++ b/ANAConversationPlatform/Helpers/Utils.cs
@@ -0,0 +1,20 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+
+namespace ANAConversationPlatform.Helpers
+{
+    public static class Utils
+    {
+        public static Settings Settings { get; set; }
+    }
+
+    public class Settings
+    {
+        public string StudioDistFolder { get; set; }
+        public int MaxCapTimeTakenToType { get; set; }
+        public int BaseTimeTakenToTypePerChar { get; set; }
+        public int VariableTimeTakenToTypePerChar { get; set; }
+    }
+}
diff --git a/ANAConversationPlatform/Models/Button.cs b/ANAConversationPlatform/Models/Button.cs
index dcdf56c..7efd8cc 100644
--- a/ANAConversationPlatform/Models/Button.cs
+++ b/ANAConversationPlatform/Models/Button.cs
@@ -22,15 +22,19 @@ public Button(string id = "", string buttonName = "", string buttonText = "", Em
         public ButtonTypeEnum ButtonType { get; set; }
         public string DeepLinkUrl { get; set; }
         public string Url { get; set; }
-        public int? BounceTimeout { get; set; } = null;
+        public int? BounceTimeout { get; set; }
         public string NextNodeId { get; set; }
-        public bool DefaultButton { get; set; } = false;
+        public bool DefaultButton { get; set; }
         public bool Hidden { get; set; }
-        public string VariableValue { get; set; } = null;
-        public bool ConfirmInput { get; set; }
-        public string PrefixText { get; set; } = null;
-        public string PostfixText { get; set; } = null;
-        public string PlaceholderText { get; set; } = null;
+        public string VariableValue { get; set; }
+        public string PrefixText { get; set; }
+        public string PostfixText { get; set; }
+        public string PlaceholderText { get; set; }
+
+        public string APIResponseMatchKey { get; set; }
+        public string APIResponseMatchValue { get; set; }
+
+        public bool PostToChat { get; set; } = true;
     }
     public enum ButtonTypeEnum
     {
@@ -49,6 +53,7 @@ public enum ButtonTypeEnum
         NextNode,
         DeepLink,
         GetAgent,
-        ApiCall
+        ApiCall,
+        ShowConfirmation
     }
 }
\ No newline at end of file
diff --git a/ANAConversationPlatform/Models/ChatNode.cs b/ANAConversationPlatform/Models/ChatNode.cs
index b53795a..d73fbc5 100644
--- a/ANAConversationPlatform/Models/ChatNode.cs
+++ b/ANAConversationPlatform/Models/ChatNode.cs
@@ -1,4 +1,5 @@
 using ANAConversationPlatform.Models.Sections;
+using Newtonsoft.Json;
 using System.Collections.Generic;
 
 namespace ANAConversationPlatform.Models
@@ -11,28 +12,43 @@ public ChatNode(string id)
             this.Id = id;
         }
 
-        public string Name { get; set; } = null;
+        public string Name { get; set; }
         public string Id { get; set; }
+
+        [JsonIgnore] //bsonIgnore should NOT be used here
+        public bool IsStartNode { get; set; }
+
         public EmotionEnum Emotion { get; set; }
         public int TimeoutInMs { get; set; }
         public NodeTypeEnum NodeType { get; set; } = NodeTypeEnum.Combination;
         public List<Section> Sections { get; set; } = new List<Section>();
         public List<Button> Buttons { get; set; } = new List<Button>();
-        public string VariableName { get; set; } = null;
-        public string ApiMethod { get; set; } = null;
-        public string ApiUrl { get; set; } = null;
-        public string NextNodeId { get; set; } = null;
-        public string[] RequiredVariables { get; set; } = null;
+        public string VariableName { get; set; }
+        public string ApiMethod { get; set; }
+        public string ApiUrl { get; set; }
+        public string NextNodeId { get; set; }
+        public string[] RequiredVariables { get; set; }
         public string GroupName { get; set; }
+
+        #region Card Node
+        public string CardHeader { get; set; }
+        public string CardFooter { get; set; }
+        public Placement? Placement { get; set; }
+        #endregion
     }
 
     public enum NodeTypeEnum
     {
-        Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml, ApiCall, Combination
-    };
+        Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml, ApiCall, Combination, Card
+    }
 
     public enum EmotionEnum
     {
         Cool, Happy, Excited, Neutral, Sad, Irritated, Angry
-    };
+    }
+
+    public enum Placement
+    {
+        Incoming, Outgoing, Center
+    }
 }
\ No newline at end of file
diff --git a/ANAConversationPlatform/Models/Content.cs b/ANAConversationPlatform/Models/Content.cs
index 881e43e..17b52d0 100644
--- a/ANAConversationPlatform/Models/Content.cs
+++ b/ANAConversationPlatform/Models/Content.cs
@@ -29,5 +29,9 @@ public class Content
         public string CoordinateListId { get; set; }
         public string CoordinateText { get; set; }
 
+        #region Carousal Item and Button Identifiers
+        public string CarouselItemId { get; set; }
+        public string CarouselButtonId { get; set; }
+        #endregion
     }
 }
diff --git a/ANAConversationPlatform/Models/Sections/CarouselSection.cs b/ANAConversationPlatform/Models/Sections/CarouselSection.cs
new file mode 100644
index 0000000..609622c
--- /dev/null
+++ b/ANAConversationPlatform/Models/Sections/CarouselSection.cs
@@ -0,0 +1,39 @@
+using System.Collections.Generic;
+
+namespace ANAConversationPlatform.Models.Sections
+{
+    public class CarouselSection : Section
+    {
+        public CarouselSection()
+        {
+            SectionType = SectionTypeEnum.Carousel;
+        }
+        public string Title { get; set; }
+        public string Caption { get; set; }
+        public List<CarouselItem> Items { get; set; } = new List<CarouselItem>();
+    }
+
+    public class CarouselItem : BaseEntity
+    {
+        public string Title { get; set; }
+        public string Caption { get; set; }
+        public string ImageUrl { get; set; }
+        public List<CarouselButton> Buttons { get; set; } = new List<CarouselButton>();
+    }
+
+    public class CarouselButton : BaseEntity
+    {
+        public string Text { get; set; }
+        public string Url { get; set; }
+        public CardButtonType Type { get; set; }
+        public string VariableValue { get; set; }
+        public string NextNodeId { get; set; }
+    }
+
+    public enum CardButtonType
+    {
+        NextNode,
+        DeepLink,
+        OpenUrl
+    }
+}
diff --git a/ANAConversationPlatform/Models/Sections/PrintOTPSection.cs b/ANAConversationPlatform/Models/Sections/PrintOTPSection.cs
new file mode 100644
index 0000000..9f773ab
--- /dev/null
+++ b/ANAConversationPlatform/Models/Sections/PrintOTPSection.cs
@@ -0,0 +1,11 @@
+namespace ANAConversationPlatform.Models.Sections
+{
+    public class PrintOTPSection : Section
+    {
+        public int Length { get; set; }
+        public PrintOTPSection()
+        {
+            SectionType = SectionTypeEnum.PrintOTP;
+        }
+    }
+}
diff --git a/ANAConversationPlatform/Models/Sections/Section.cs b/ANAConversationPlatform/Models/Sections/Section.cs
index 3e0d427..8e74c0a 100644
--- a/ANAConversationPlatform/Models/Sections/Section.cs
+++ b/ANAConversationPlatform/Models/Sections/Section.cs
@@ -4,17 +4,17 @@
 namespace ANAConversationPlatform.Models.Sections
 {
     public class Section : BaseEntity
-	{
+    {
         public Section() { }
-		public Section(string id, SectionTypeEnum sectionType, int delayInMs)
-		{
-			this._id = id;
-			this.SectionType = sectionType;
-			this.DelayInMs = delayInMs;
-		}
-		public SectionTypeEnum SectionType { get; set; }
-		public int DelayInMs { get; set; } = 0;
-		public bool Hidden { get; set; } = false;
+        public Section(string id, SectionTypeEnum sectionType, int delayInMs)
+        {
+            this._id = id;
+            this.SectionType = sectionType;
+            this.DelayInMs = delayInMs;
+        }
+        public SectionTypeEnum SectionType { get; set; }
+        public int DelayInMs { get; set; } = 0;
+        public bool Hidden { get; set; } = false;
 
         [BsonIgnore]
         [JsonIgnore]
@@ -30,10 +30,10 @@ public Section(string id, SectionTypeEnum sectionType, int delayInMs)
         public int Sno { get; set; }
     }
 
-	public enum SectionTypeEnum
-	{
-		Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml
-	};
+    public enum SectionTypeEnum
+    {
+        Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml, Carousel, PrintOTP
+    };
 
     public enum MessageDirection { In, Out }
 }
\ No newline at end of file
diff --git a/ANAConversationPlatform/Startup.cs b/ANAConversationPlatform/Startup.cs
index d02bfcd..747503a 100644
--- a/ANAConversationPlatform/Startup.cs
+++ b/ANAConversationPlatform/Startup.cs
@@ -28,6 +28,7 @@ public Startup(IHostingEnvironment env)
             MongoHelper.Settings = Configuration.GetSection(nameof(DatabaseConnectionSettings)).Get<DatabaseConnectionSettings>();
             RocketChatSDK.Settings = Configuration.GetSection(nameof(AgentChatSettings)).Get<AgentChatSettings>();
             LiveClientSocketsHelper.Settings = Configuration.GetSection(nameof(LiveClientSocketsServerSettings)).Get<LiveClientSocketsServerSettings>();
+            Utils.Settings = Configuration.GetSection(nameof(Helpers.Settings)).Get<Helpers.Settings>();
         }
 
         // This method gets called by the runtime. Use this method to add services to the container.
@@ -44,6 +45,7 @@ public void Configure(IApplicationBuilder app, IHostingEnvironment env, ILoggerF
                 .AddFile(Configuration.GetSection("FileLogging"));
 
             RocketChatSDK.Logger = loggerFactory.CreateLogger<RocketChatSDK>();
+            MongoHelper.Logger = loggerFactory.CreateLogger("MongoHelper");
 
             Task.Run(async () =>
             {
diff --git a/ANAConversationPlatform/appsettings-Sample.json b/ANAConversationPlatform/appsettings-Sample.json
index a72daed..c6a7ae9 100644
--- a/ANAConversationPlatform/appsettings-Sample.json
+++ b/ANAConversationPlatform/appsettings-Sample.json
@@ -12,6 +12,12 @@
       "Microsoft": "Information"
     }
   },
+  "Settings": {
+    "StudioDistFolder": "[Path to folder where studio zips are put when an update has to be pushed, in the format, {major}.{minor}.{build}.{rev}.zip]",
+    "MaxCapTimeTakenToType": 3000,
+    "BaseTimeTakenToTypePerChar": 30,
+    "VariableTimeTakenToTypePerChar": 10
+  },
   "DatabaseConnectionSettings": {
     "ConnectionString": "[MongoDB Connection String]",
     "TemplateCollectionName": "[New Empty Collection Name A]",
diff --git a/ANAConversationSimulator/ANAConversationSimulator.csproj b/ANAConversationSimulator/ANAConversationSimulator.csproj
index fca663f..3fbe7dc 100644
--- a/ANAConversationSimulator/ANAConversationSimulator.csproj
+++ b/ANAConversationSimulator/ANAConversationSimulator.csproj
@@ -134,6 +134,7 @@
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Models\ChatActivityEvent.cs" />
+    <Compile Include="Models\Chat\Sections\PrintOTPSection.cs" />
     <Compile Include="Models\UploadFileResponse.cs" />
     <Compile Include="UIHelpers\AutoSuggestFilterItemsCommand.cs" />
     <Compile Include="UIHelpers\AutoSuggestFilterItemsConverter.cs" />
diff --git a/ANAConversationSimulator/Helpers/Utils.cs b/ANAConversationSimulator/Helpers/Utils.cs
index cb92295..ed3344a 100644
--- a/ANAConversationSimulator/Helpers/Utils.cs
+++ b/ANAConversationSimulator/Helpers/Utils.cs
@@ -39,9 +39,14 @@ public static IPropertySet LocalStore
         }
 
         public static void InitMemoryStack()
+        {
+            InitDeviceIdInMemoryStack();
+        }
+
+        public static void InitDeviceIdInMemoryStack()
         {
             if (!Utils.LocalStore.ContainsKey("DEVICE_ID"))
-                Utils.LocalStore["DEVICE_ID"] = Utils.DeviceId;
+                Utils.LocalStore["DEVICE_ID"] = Utils.GetFinalDeviceId();
         }
 
         public static void ShowDialog(string txt)
@@ -163,17 +168,15 @@ public static ChatActivityEvent GetClickEvent(string nodeId, string userId, stri
             };
         }
 
-        private static string _deviceId;
         public static string DeviceId
         {
             get
             {
-                if (_deviceId == null)
-                    _deviceId = CalculateMD5Hash(GetDeviceId());
-                return _deviceId;
+                return (string)Utils.LocalStore["DEVICE_ID"];
             }
         }
 
+        public static string GetFinalDeviceId() => CalculateMD5Hash(GetDeviceId());
         private static string GetDeviceId()
         {
             if (Windows.Foundation.Metadata.ApiInformation.IsTypePresent("Windows.System.Profile.HardwareIdentification"))
diff --git a/ANAConversationSimulator/Helpers/VerbProcessor.cs b/ANAConversationSimulator/Helpers/VerbProcessor.cs
index 519a4f7..a83063d 100644
--- a/ANAConversationSimulator/Helpers/VerbProcessor.cs
+++ b/ANAConversationSimulator/Helpers/VerbProcessor.cs
@@ -1,9 +1,6 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using System.Text.RegularExpressions;
-using System.Threading.Tasks;
 
 namespace ANAConversationSimulator.Helpers
 {
@@ -21,7 +18,7 @@ public static string Process(string input)
                     var varName = match.Groups[1].Value;
                     var value = ButtonActionHelper.GetSavedValue(varName);
                     if (!string.IsNullOrWhiteSpace(value + ""))
-                        input = input.Replace(match.Value, value + "");
+                        input = input.Replace(match.Value, JsonConvert.SerializeObject(value + "").Trim('"'));
                 }
             }
             return input;
diff --git a/ANAConversationSimulator/Models/Chat/Button.cs b/ANAConversationSimulator/Models/Chat/Button.cs
index 585070b..6edb84e 100644
--- a/ANAConversationSimulator/Models/Chat/Button.cs
+++ b/ANAConversationSimulator/Models/Chat/Button.cs
@@ -21,10 +21,14 @@ public Button() { }
         public bool Hidden { get; set; }
         public string VariableValue { get; set; }
         public string PlaceholderText { get; set; }
-        public bool ConfirmInput { get; set; }
         public string PrefixText { get; set; }
         public string PostfixText { get; set; }
 
+        public string APIResponseMatchKey { get; set; }
+        public string APIResponseMatchValue { get; set; }
+
+        public bool PostToChat { get; set; } = true;
+
         private Dictionary<string, string> _items;
         /// <summary>
         /// Contains visible/filtered items in case of <see cref="ButtonTypeEnum.GetItemFromSource"/>
@@ -112,6 +116,7 @@ public enum ButtonTypeEnum
         NextNode,
         DeepLink,
         GetAgent,
-        ApiCall
+        ApiCall,
+        ShowConfirmation
     }
 }
\ No newline at end of file
diff --git a/ANAConversationSimulator/Models/Chat/ChatNode.cs b/ANAConversationSimulator/Models/Chat/ChatNode.cs
index 7ba42ac..797d7db 100644
--- a/ANAConversationSimulator/Models/Chat/ChatNode.cs
+++ b/ANAConversationSimulator/Models/Chat/ChatNode.cs
@@ -9,30 +9,41 @@ public ChatNode(string id)
             this.Id = id;
         }
 
-        public string Name { get; set; } = null;
-        public string HeaderText { get; set; } = null;
+        public string Name { get; set; }
+        public string HeaderText { get; set; }
         public string Id { get; set; }
         public EmotionEnum Emotion { get; set; }
         public int TimeoutInMs { get; set; }
         public NodeTypeEnum NodeType { get; set; } = NodeTypeEnum.Combination;
         public List<Section> Sections { get; set; } = new List<Section>();
         public List<Button> Buttons { get; set; } = new List<Button>();
-        public string VariableName { get; set; } = null;
-        public string ApiMethod { get; set; } = null;
-        public string ApiUrl { get; set; } = null;
-        public string[] RequiredVariables { get; set; } = null;
-        public string NextNodeId { get; set; } = null;
+        public string VariableName { get; set; }
+        public string ApiMethod { get; set; }
+        public string ApiUrl { get; set; }
+        public string[] RequiredVariables { get; set; }
+        public string NextNodeId { get; set; }
         public bool IsStartNode { get; set; }
         public string GroupName { get; set; }
+
+        #region Card Node
+        public string CardHeader { get; set; }
+        public string CardFooter { get; set; }
+        public Placement? Placement { get; set; }
+        #endregion
     }
 
     public enum NodeTypeEnum
     {
-        Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml, ApiCall, Combination
-    };
+        Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml, ApiCall, Combination, Card
+    }
 
     public enum EmotionEnum
     {
         Cool, Happy, Excited, Neutral, Sad, Irritated, Angry
-    };
+    }
+
+    public enum Placement
+    {
+        Incoming, Outgoing, Center
+    }
 }
\ No newline at end of file
diff --git a/ANAConversationSimulator/Models/Chat/Sections/CarouselSection.cs b/ANAConversationSimulator/Models/Chat/Sections/CarouselSection.cs
index cdafa87..f360e75 100644
--- a/ANAConversationSimulator/Models/Chat/Sections/CarouselSection.cs
+++ b/ANAConversationSimulator/Models/Chat/Sections/CarouselSection.cs
@@ -1,40 +1,49 @@
-using System.Collections.Generic;
+using ANAConversationSimulator.Services.ChatInterfaceServices;
+using Newtonsoft.Json;
+using System;
+using System.Collections.Generic;
+using System.Windows.Input;
 
 namespace ANAConversationSimulator.Models.Chat.Sections
 {
-	public class CarouselSection : Section
-	{
-		public CarouselSection(string id, int delayInMs = 0) : base(id, SectionTypeEnum.Carousel, delayInMs)
-		{
+    public class CarouselSection : Section
+    {
+        public CarouselSection()
+        {
+            SectionType = SectionTypeEnum.Carousel;
+        }
+        public List<CarouselItem> Items { get; set; } = new List<CarouselItem>();
+    }
 
-		}
+    public class CarouselItem : BaseEntity
+    {
+        public string Title { get; set; }
+        public string Caption { get; set; }
+        public string ImageUrl { get; set; }
+        public List<CarouselButton> Buttons { get; set; } = new List<CarouselButton>();
+    }
 
-		public List<Carousel> CarouselList { get; set; } = new List<Carousel>();
+    public class CarouselButton : BaseEntity
+    {
+        public string Text { get; set; }
+        public string Url { get; set; }
+        public CardButtonType Type { get; set; }
+        public string VariableValue { get; set; }
+        public string NextNodeId { get; set; }
 
-		public void AddNewCarouselEntry(Carousel carouselEntry)
-		{
-			if (CarouselList == null)
-				CarouselList = new List<Carousel>();
-			CarouselList.Add(carouselEntry);
-		}
+        [JsonIgnore]
+        public ICommand Action { get; set; } = new ButtonActionCommand();
 
-	}
+        [JsonIgnore]
+        public string VariableName { get; set; }
+        [JsonIgnore]
+        public string NodeId { get; set; }
+    }
 
-	public class Carousel
-	{
-		public Carousel(string title, string imageUrl)
-		{
-			this.Title = title;
-			this.ImageUrl = imageUrl;
-		}
-		public string Title { get; set; }
-		public string ImageUrl { get; set; } = null;
-		public List<string> Values { get; set; } = new List<string>();
-		public void AddValue(string value)
-		{
-			if (Values == null)
-				Values = new List<string>();
-			Values.Add(value);
-		}
-	}
+    public enum CardButtonType
+    {
+        NextNode,
+        DeepLink,
+        OpenUrl
+    }
 }
\ No newline at end of file
diff --git a/ANAConversationSimulator/Models/Chat/Sections/PrintOTPSection.cs b/ANAConversationSimulator/Models/Chat/Sections/PrintOTPSection.cs
new file mode 100644
index 0000000..4c9a128
--- /dev/null
+++ b/ANAConversationSimulator/Models/Chat/Sections/PrintOTPSection.cs
@@ -0,0 +1,13 @@
+using ANAConversationSimulator.Models.Chat;
+
+namespace ANAConversationSimulator.Models.Sections
+{
+    public class PrintOTPSection : Section
+    {
+        public int Length { get; set; }
+        public PrintOTPSection()
+        {
+            SectionType = SectionTypeEnum.PrintOTP;
+        }
+    }
+}
diff --git a/ANAConversationSimulator/Models/Chat/Sections/Section.cs b/ANAConversationSimulator/Models/Chat/Sections/Section.cs
index 7309033..65260dc 100644
--- a/ANAConversationSimulator/Models/Chat/Sections/Section.cs
+++ b/ANAConversationSimulator/Models/Chat/Sections/Section.cs
@@ -18,15 +18,15 @@ public Section(string id, SectionTypeEnum sectionType, int delayInMs)
         public bool Hidden { get; set; } = false;
         public int Sno { get; set; }
         public MessageDirection Direction { get; set; }
-        public string Title { get; set; } = null;
-        public string Caption { get; set; } = null;
+        public string Title { get; set; }
+        public string Caption { get; set; }
         public Section() { }
     }
 
     public enum SectionTypeEnum
     {
-        Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml, Carousel, Typing
-    };
+        Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml, Carousel, Typing, PrintOTP
+    }
 
     public enum MessageDirection { In, Out }
 }
\ No newline at end of file
diff --git a/ANAConversationSimulator/Package.appxmanifest b/ANAConversationSimulator/Package.appxmanifest
index 9a1f684..986af33 100644
--- a/ANAConversationSimulator/Package.appxmanifest
+++ b/ANAConversationSimulator/Package.appxmanifest
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" IgnorableNamespaces="uap mp">
-  <Identity Name="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" Publisher="CN=ProjectANA" Version="1.0.57.0" />
+  <Identity Name="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" Publisher="CN=ProjectANA" Version="1.0.66.0" />
   <mp:PhoneIdentity PhoneProductId="44cabbc3-0a2f-4255-b5bb-b099cd5762f9" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
     <DisplayName>ANA Conversation Simulator</DisplayName>
diff --git a/ANAConversationSimulator/Services/ChatInterfaceServices/ButtonActionCommand.cs b/ANAConversationSimulator/Services/ChatInterfaceServices/ButtonActionCommand.cs
index 7ec7975..879d6b2 100644
--- a/ANAConversationSimulator/Services/ChatInterfaceServices/ButtonActionCommand.cs
+++ b/ANAConversationSimulator/Services/ChatInterfaceServices/ButtonActionCommand.cs
@@ -7,6 +7,8 @@
 using System.Threading.Tasks;
 using System.Collections.Generic;
 using Windows.System.Threading;
+using ANAConversationSimulator.Models.Chat.Sections;
+using ANAConversationSimulator.ViewModels;
 
 namespace ANAConversationSimulator.Services.ChatInterfaceServices
 {
@@ -151,6 +153,12 @@ public async void Execute(object parameter)
                         if (!button.Hidden)
                             ButtonActionHelper.HandlePostTextToThread(button.ButtonText);
                         break;
+                    case ButtonTypeEnum.GetAgent:
+                        if (MainPageViewModel.CurrentInstance != null)
+                            MainPageViewModel.CurrentInstance.AgentChat();
+                        if (!button.Hidden)
+                            ButtonActionHelper.HandlePostTextToThread(button.ButtonText);
+                        break;
                     default:
                         Utils.ShowDialog($"Button type: {button.ButtonType} not supported");
                         break;
@@ -158,22 +166,70 @@ public async void Execute(object parameter)
                 trackViewEvent(button, userData);
                 ButtonActionHelper.NavigateToNode(button.NextNodeId);
             }
+            else if (parameter is CarouselButton cButton)
+            {
+                var userData = new Dictionary<string, string>();
+                switch (cButton.Type)
+                {
+                    case CardButtonType.NextNode:
+                        if (!string.IsNullOrWhiteSpace(cButton.VariableName) && cButton.VariableValue != null) //VariableValue should be != null only
+                        {
+                            ButtonActionHelper.HandleSaveTextInput(cButton.VariableName, cButton.VariableValue);
+                            userData[cButton.VariableName] = cButton.VariableValue;
+                        }
+                        break;
+                    case CardButtonType.DeepLink:
+                        await ButtonActionHelper.HandleDeepLinkAsync(cButton.Url);
+                        break;
+                    case CardButtonType.OpenUrl:
+                        ButtonActionHelper.HandleOpenUrl(cButton.Url);
+                        break;
+                    default:
+                        Utils.ShowDialog($"Button type: {cButton.Type} not supported");
+                        break;
+                }
+                trackViewEvent(cButton, userData);
+                ButtonActionHelper.NavigateToNode(cButton.NextNodeId);
+            }
         }
 
         private async void trackViewEvent(Button button, Dictionary<string, string> userData)
         {
             await Task.Run(async () =>
             {
-                try
-                {
-                    if (userData.Count == 0)
-                        userData = null;
-                    await APIHelper.TrackEvent(Utils.GetClickEvent(button.NodeId, Utils.DeviceId, button._id, button.ButtonText, userData));
-                }
-                catch (Exception ex)
+                await Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, async () =>
+                 {
+                     try
+                     {
+                         if (userData.Count == 0)
+                             userData = null;
+                         await APIHelper.TrackEvent(Utils.GetClickEvent(button.NodeId, Utils.DeviceId, button._id, button.ButtonText, userData));
+                     }
+                     catch (Exception ex)
+                     {
+                         await Utils.ShowDialogAsync(ex.ToString());
+                     }
+                 });
+            });
+        }
+        private async void trackViewEvent(CarouselButton cButton, Dictionary<string, string> userData)
+        {
+            await Task.Run(async () =>
+            {
+                await Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, async () =>
                 {
-                    await Utils.ShowDialogAsync(ex.ToString());
-                }
+                    try
+                    {
+                        if (userData.Count == 0)
+                            userData = null;
+                        await APIHelper.TrackEvent(Utils.GetClickEvent(cButton.NodeId, Utils.DeviceId, cButton._id, cButton.Text, userData));
+                    }
+                    catch (Exception ex)
+                    {
+                        await Utils.ShowDialogAsync(ex.ToString());
+                    }
+                });
+
             });
         }
     }
diff --git a/ANAConversationSimulator/Styles/Custom.xaml b/ANAConversationSimulator/Styles/Custom.xaml
index 9571cdc..63b17f4 100644
--- a/ANAConversationSimulator/Styles/Custom.xaml
+++ b/ANAConversationSimulator/Styles/Custom.xaml
@@ -67,6 +67,47 @@
             </StackPanel>
         </C4F:ChatBubble>
     </DataTemplate>
+    <DataTemplate x:Key="CarouselSectionChatBubbleTemplate">
+        <C4F:ChatBubble BorderBrush="{Binding Direction, Converter={StaticResource DirectionToBackgroundColorConverter}}" Background="{Binding Direction, Converter={StaticResource DirectionToBackgroundColorConverter}}" HorizontalAlignment="{Binding Direction, Converter={StaticResource DirectionToAlignmentConverter}}" ChatBubbleDirection="{Binding Direction, Converter={StaticResource DirectionToBubbleDirectionConverter}}">
+            <StackPanel Background="{StaticResource PaleWhiteBrush}">
+                <TextBlock Text="{Binding Title}" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" Foreground="Black" />
+                <ScrollViewer MaxHeight="300" HorizontalScrollBarVisibility="Auto" Padding="-5,0" VerticalScrollBarVisibility="Disabled">
+                    <ItemsControl ItemsSource="{Binding Items}">
+                        <ItemsControl.ItemsPanel>
+                            <ItemsPanelTemplate>
+                                <ItemsStackPanel Orientation="Horizontal" Margin="0,0,0,20"/>
+                            </ItemsPanelTemplate>
+                        </ItemsControl.ItemsPanel>
+                        <ItemsControl.ItemTemplate>
+                            <DataTemplate>
+                                <Grid VerticalAlignment="Center" Padding="5" Margin="5" Background="White">
+                                    <Grid.RowDefinitions>
+                                        <RowDefinition/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                        <RowDefinition Height="Auto"/>
+                                    </Grid.RowDefinitions>
+                                    <Image Margin="5" Source="{Binding ImageUrl}" Visibility="{Binding ImageUrl, Converter={StaticResource C4FS2V}}" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                                    <TextBlock Grid.Row="1" Text="{Binding Title}" Margin="5" TextAlignment="Center" Visibility="{Binding Title, Converter={StaticResource C4FS2V}}" Style="{StaticResource TitleTextStyle}" Foreground="Black"/>
+                                    <TextBlock Grid.Row="2" Text="{Binding Caption}" Margin="5,5,5,10" TextAlignment="Center" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  Foreground="Black"/>
+                                    <ItemsControl Grid.Row="3" ItemsSource="{Binding Buttons}">
+                                        <ItemsControl.ItemTemplate>
+                                            <DataTemplate>
+                                                <Button HorizontalAlignment="Stretch" MinWidth="150" HorizontalContentAlignment="Stretch" Command="{Binding Action}" CommandParameter="{Binding}" Background="White" BorderBrush="Black" BorderThickness="1" Margin="2">
+                                                    <TextBlock Text="{Binding Text}" TextWrapping="Wrap" TextAlignment="Center" />
+                                                </Button>
+                                            </DataTemplate>
+                                        </ItemsControl.ItemTemplate>
+                                    </ItemsControl>
+                                </Grid>
+                            </DataTemplate>
+                        </ItemsControl.ItemTemplate>
+                    </ItemsControl>
+                </ScrollViewer>
+                <TextBlock Text="{Binding Caption}" Visibility="{Binding Caption, Converter={StaticResource C4FS2V}}" Style="{StaticResource CaptionTextStyle}"  Foreground="Black"/>
+            </StackPanel>
+        </C4F:ChatBubble>
+    </DataTemplate>
     <DataTemplate x:Key="VideoSectionChatBubbleTemplate">
         <C4F:ChatBubble BorderBrush="{Binding Direction, Converter={StaticResource DirectionToBackgroundColorConverter}}" Background="{Binding Direction, Converter={StaticResource DirectionToBackgroundColorConverter}}" HorizontalAlignment="{Binding Direction, Converter={StaticResource DirectionToAlignmentConverter}}" ChatBubbleDirection="{Binding Direction, Converter={StaticResource DirectionToBubbleDirectionConverter}}">
             <StackPanel Width="300">
diff --git a/ANAConversationSimulator/ViewModels/MainPageViewModel.cs b/ANAConversationSimulator/ViewModels/MainPageViewModel.cs
index 13d0ea0..05487d1 100644
--- a/ANAConversationSimulator/ViewModels/MainPageViewModel.cs
+++ b/ANAConversationSimulator/ViewModels/MainPageViewModel.cs
@@ -83,7 +83,11 @@ public async void StartChatting()
         private DispatcherTimer buttonTimeoutTimer;
         public async void ProcessNode(JToken node, JToken section = null)
         {
-            if (node == null) return;
+            if (node == null)
+            {
+                Utils.ShowDialog("Node not found!");
+                return;
+            }
             ClearButtonTimer();
 
             //Replaceing verbs
@@ -99,32 +103,41 @@ public async void ProcessNode(JToken node, JToken section = null)
                 try
                 {
                     var paramDict = new Dictionary<string, object>();
-                    foreach (var reqParam in parsedNode.RequiredVariables)
-                    {
-                        if (reqParam == "HISTORY") //Custom Variable
-                            paramDict[reqParam] = ChatThread.Where(x => x.SectionType != SectionTypeEnum.Typing).ToArray();
-                        else
-                            paramDict[reqParam] = ButtonActionHelper.GetSavedValue(reqParam);
-                    }
+                    if (parsedNode.RequiredVariables != null)
+                        foreach (var reqParam in parsedNode.RequiredVariables)
+                        {
+                            if (reqParam == "HISTORY") //Custom Variable
+                                paramDict[reqParam] = ChatThread.Where(x => x.SectionType != SectionTypeEnum.Typing).ToArray();
+                            else
+                                paramDict[reqParam] = ButtonActionHelper.GetSavedValue(reqParam);
+                        }
                     var nextNodeId = parsedNode.NextNodeId; //Default
                     switch (parsedNode.ApiMethod.ToUpper())
                     {
                         case "GET":
                             {
                                 var query = string.Join("&", paramDict.Select(x => $"{x.Key}={Uri.EscapeDataString(x.Value + "")}"));
-                                var api = string.IsNullOrWhiteSpace(query) ? parsedNode.ApiUrl : parsedNode.ApiUrl + "?" + query;
+                                var api = string.IsNullOrWhiteSpace(query) ? parsedNode.ApiUrl : parsedNode.ApiUrl + (parsedNode.ApiUrl?.Contains("?") == true ? "&" : "?") + query;
+
+                                var resp = await APIHelper.HitAsync<JObject>(api);
 
-                                var resp = await APIHelper.HitAsync<Dictionary<string, object>>(api);
-                                if (resp.ContainsKey("NextNodeId"))
+                                if (!string.IsNullOrWhiteSpace(resp["NextNodeId"] + ""))
                                     nextNodeId = resp["NextNodeId"] + "";
-                                ButtonActionHelper.HandleSaveMultiple(resp);
+
+                                ButtonActionHelper.HandleSaveMultiple(resp.ToObject<Dictionary<string, object>>());
+                                var apiNextNodeId = ExtractNextNodeIdFromAPIResp(parsedNode, resp);
+                                if (!string.IsNullOrWhiteSpace(apiNextNodeId))
+                                    nextNodeId = apiNextNodeId;
                             }
                             break;
                         case "POST":
                             {
-                                var resp = await APIHelper.HitPostAsync<Dictionary<string, object>, Dictionary<string, object>>(parsedNode.ApiUrl, paramDict);
-                                if (resp.ContainsKey("NextNodeId"))
+                                var resp = await APIHelper.HitPostAsync<Dictionary<string, object>, JObject>(parsedNode.ApiUrl, paramDict);
+                                if (!string.IsNullOrWhiteSpace(resp["NextNodeId"] + ""))
                                     nextNodeId = resp["NextNodeId"] + "";
+                                var apiNextNodeId = ExtractNextNodeIdFromAPIResp(parsedNode, resp);
+                                if (!string.IsNullOrWhiteSpace(apiNextNodeId))
+                                    nextNodeId = apiNextNodeId;
                             }
                             break;
                         default:
@@ -184,9 +197,19 @@ public async void ProcessNode(JToken node, JToken section = null)
                     case SectionTypeEnum.EmbeddedHtml:
                         parsedSection = currentSectionSource.ToObject<EmbeddedHtmlSection>();
                         break;
+                    case SectionTypeEnum.Carousel:
+                        parsedSection = currentSectionSource.ToObject<CarouselSection>();
+                        (parsedSection as CarouselSection).Items
+                            .SelectMany(x => x.Buttons)
+                            .Where(X => X != null).ToList()
+                            .ForEach(x =>
+                            {
+                                x.VariableName = parsedNode.VariableName;
+                                x.NodeId = parsedNode.Id;
+                            });
+                        break;
                     case SectionTypeEnum.Link:
                     case SectionTypeEnum.Graph:
-                    case SectionTypeEnum.Carousel:
                         Utils.ShowDialog($"{secType} Coming soon!");
                         break;
                     default:
@@ -210,14 +233,17 @@ public async void ProcessNode(JToken node, JToken section = null)
                             {
                                 await Task.Run(async () =>
                                 {
-                                    try
+                                    await Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(Windows.UI.Core.CoreDispatcherPriority.Normal, async () =>
                                     {
-                                        await APIHelper.TrackEvent(Utils.GetViewEvent(parsedNode.Id, Utils.DeviceId));
-                                    }
-                                    catch (Exception ex)
-                                    {
-                                        await Utils.ShowDialogAsync(ex.ToString());
-                                    }
+                                        try
+                                        {
+                                            await APIHelper.TrackEvent(Utils.GetViewEvent(parsedNode.Id, Utils.DeviceId));
+                                        }
+                                        catch (Exception ex)
+                                        {
+                                            await Utils.ShowDialogAsync(ex.ToString());
+                                        }
+                                    });
                                 });
                             }
                             AddIncommingSection(parsedSection);
@@ -352,7 +378,15 @@ public void NavigateToNode(string nextNodeId)
             if (!string.IsNullOrWhiteSpace(nextNodeId))
                 ProcessNode(GetNodeById(nextNodeId));
         }
-
+        private string ExtractNextNodeIdFromAPIResp(ChatNode node, JObject resp)
+        {
+            if (node.Buttons == null)
+                return null;
+            return node.Buttons.FirstOrDefault(btn =>
+                !string.IsNullOrWhiteSpace(btn.APIResponseMatchKey) && //resp[btn.APIResponseMatchKey] != null &&
+                resp.SelectToken(btn.APIResponseMatchKey) + "" == btn.APIResponseMatchValue + "")
+                    ?.NextNodeId;
+        }
         #region Default
         public override async Task OnNavigatedToAsync(object parameter, NavigationMode mode, IDictionary<string, object> suspensionState)
         {
diff --git a/ANAConversationStudio/ANAConversationStudio.csproj b/ANAConversationStudio/ANAConversationStudio.csproj
index 6bc0424..8633b50 100644
--- a/ANAConversationStudio/ANAConversationStudio.csproj
+++ b/ANAConversationStudio/ANAConversationStudio.csproj
@@ -131,13 +131,19 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </ApplicationDefinition>
+    <Compile Include="Controls\ChatElementCollectionEditor.cs" />
     <Compile Include="Controls\ChatNodeCollectionEditor.cs" />
     <Compile Include="Controls\ChatContentCollectionControl.cs" />
     <Compile Include="Controls\ChatNodeCollectionControl.cs" />
+    <Compile Include="Controls\ReadonlyTextBoxEditor.cs" />
     <Compile Include="Helpers\MongoHelper.cs" />
     <Compile Include="Helpers\Shortcuts.cs" />
+    <Compile Include="Models\Chat\Sections\PrintOTPSection.cs" />
     <Compile Include="Models\LayoutPoint.cs" />
     <Compile Include="UIHelpers\NullToBoolConverter.cs" />
+    <Compile Include="Views\ChatElementCollectionEditorWindow.xaml.cs">
+      <DependentUpon>ChatElementCollectionEditorWindow.xaml</DependentUpon>
+    </Compile>
     <Compile Include="Views\DBConnectionManager.xaml.cs">
       <DependentUpon>DBConnectionManager.xaml</DependentUpon>
     </Compile>
@@ -166,10 +172,27 @@
     <Compile Include="UIHelpers\BindingProxy.cs" />
     <Compile Include="UIHelpers\NullToVisibilityConverter.cs" />
     <Compile Include="UIHelpers\BindingToTypeNameConverter.cs" />
+    <Compile Include="Views\EnterPassword.xaml.cs">
+      <DependentUpon>EnterPassword.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SetPassword.xaml.cs">
+      <DependentUpon>SetPassword.xaml</DependentUpon>
+    </Compile>
+    <Compile Include="Views\SettingsWindow.xaml.cs">
+      <DependentUpon>SettingsWindow.xaml</DependentUpon>
+    </Compile>
+    <Page Include="Views\ChatElementCollectionEditorWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\DBConnectionManager.xaml">
       <SubType>Designer</SubType>
       <Generator>MSBuild:Compile</Generator>
     </Page>
+    <Page Include="Views\EnterPassword.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
     <Page Include="Views\MainWindow.xaml">
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
@@ -193,6 +216,14 @@
       <Generator>MSBuild:Compile</Generator>
       <SubType>Designer</SubType>
     </Page>
+    <Page Include="Views\SetPassword.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
+    <Page Include="Views\SettingsWindow.xaml">
+      <SubType>Designer</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Page>
   </ItemGroup>
   <ItemGroup>
     <Compile Include="ViewModels\MainWindowViewModel.cs" />
@@ -224,6 +255,9 @@
       <LastGenOutput>Settings.Designer.cs</LastGenOutput>
     </None>
     <AppDesigner Include="Properties\" />
+    <Content Include="Tools\extract.bat">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
   </ItemGroup>
   <ItemGroup>
     <Resource Include="Resources\block_16.png" />
@@ -233,6 +267,11 @@
   <ItemGroup>
     <Resource Include="favicon.ico" />
   </ItemGroup>
+  <ItemGroup>
+    <Content Include="Tools\7za.exe">
+      <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
+    </Content>
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/ANAConversationStudio/App.xaml.cs b/ANAConversationStudio/App.xaml.cs
index 087782a..3d6354d 100644
--- a/ANAConversationStudio/App.xaml.cs
+++ b/ANAConversationStudio/App.xaml.cs
@@ -14,5 +14,6 @@ private void Application_DispatcherUnhandledException(object sender, System.Wind
             Logger.Write(e.Exception);
             MessageBox.Show(e.Exception.StackTrace, e.Exception.Message);
         }
+        public static string Cryptio { get; set; }
     }
 }
diff --git a/ANAConversationStudio/Controls/ChatContentCollectionControl.cs b/ANAConversationStudio/Controls/ChatContentCollectionControl.cs
index db3e257..3d51501 100644
--- a/ANAConversationStudio/Controls/ChatContentCollectionControl.cs
+++ b/ANAConversationStudio/Controls/ChatContentCollectionControl.cs
@@ -7,6 +7,7 @@
 using System.Linq;
 using System.Windows;
 using Xceed.Wpf.Toolkit;
+using ANAConversationStudio.Models.Chat.Sections;
 
 namespace ANAConversationStudio.Controls
 {
@@ -115,6 +116,12 @@ private void PreProccessAddingItem(object item)
                 else if (ChatContentOwner is Button && item is ButtonContent)
                     (item as ButtonContent).ButtonId = (ChatContentOwner as Button)._id;
             }
+
+            if (item is CarouselButtonContent cBtnContent && ChatContentOwner != null && ChatContentOwner is CarouselButton cBtn)
+                cBtnContent.CarouselButtonId = cBtn._id;
+
+            if (item is CarouselItemContent cItemContent && ChatContentOwner != null && ChatContentOwner is CarouselItem cItem)
+                cItemContent.CarouselItemId = cItem._id;
         }
         private void ContentItemAdded(BaseContent item)
         {
diff --git a/ANAConversationStudio/Controls/ChatElementCollectionEditor.cs b/ANAConversationStudio/Controls/ChatElementCollectionEditor.cs
new file mode 100644
index 0000000..a641e42
--- /dev/null
+++ b/ANAConversationStudio/Controls/ChatElementCollectionEditor.cs
@@ -0,0 +1,139 @@
+using MongoDB.Bson;
+using ANAConversationStudio.Models;
+using ANAConversationStudio.Views;
+using System;
+using System.Collections;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.Linq;
+using System.Windows;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit;
+using Xceed.Wpf.Toolkit.PropertyGrid;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
+using System.Threading.Tasks;
+
+namespace ANAConversationStudio.Controls
+{
+    public class ChatElementCollectionEditor<T> : TypeEditor<Button>
+    {
+        protected override void SetValueDependencyProperty()
+        {
+            ValueProperty = CollectionControlButton.ItemsSourceProperty;
+        }
+        private PropertyItem _propertyItem;
+        private ChatNodeCollectionControl _collectionControl;
+        private ChatElementCollectionEditorWindow editorWindow;
+        protected override void ResolveValueBinding(PropertyItem propertyItem)
+        {
+            _propertyItem = propertyItem;
+            _collectionControl = new ChatNodeCollectionControl()
+            {
+                ItemsSource = _propertyItem.Value as IEnumerable,
+                ItemsSourceType = _propertyItem.PropertyType,
+                Margin = new Thickness(10),
+                OwnerChatNode = propertyItem.Instance as Models.Chat.ChatNode,
+                NewItemTypes = _propertyItem.PropertyDescriptor.Attributes.Cast<Attribute>().Where(x => x is NewItemTypesAttribute).Cast<NewItemTypesAttribute>().SelectMany(x => x.Types).ToList()
+            };
+
+            if (_collectionControl.NewItemTypes == null || _collectionControl.NewItemTypes.Count == 0)
+            {
+                if (_propertyItem.PropertyType.BaseType == typeof(Array))
+                    _collectionControl.NewItemTypes = new List<Type>() { _propertyItem.PropertyType.GetElementType() };
+                else if (_propertyItem.PropertyType.GetGenericArguments().Count() > 0)
+                    _collectionControl.NewItemTypes = new List<Type>() { _propertyItem.PropertyType.GetGenericArguments()[0] };
+            }
+
+            _collectionControl.Loaded += _collectionControl_Loaded;
+            _collectionControl.ItemAdding += ItemAdding;
+            _collectionControl.ItemAdded += ItemAddedAsync;
+            _collectionControl.ItemDeleted += ItemCollectionChanged;
+            _collectionControl.ItemMovedDown += ItemCollectionChanged;
+            _collectionControl.ItemMovedUp += ItemCollectionChanged;
+
+            Editor.Content = "Edit";
+            Editor.Click += (s, e) =>
+            {
+                InvalidatePropertyGrid();
+                if (editorWindow != null)
+                {
+                    editorWindow.Close();
+                    editorWindow = null;
+                }
+                editorWindow = new ChatElementCollectionEditorWindow(_collectionControl);
+                editorWindow.ShowDialog();
+            };
+            base.ResolveValueBinding(_propertyItem);
+        }
+
+        private async void ItemAddedAsync(object sender, ItemEventArgs e)
+        {
+            InvalidateSource();
+            await Application.Current.Dispatcher.InvokeAsync(() =>
+            {
+                var editor = editorWindow.ChatElementContentCollectionEditor;
+                if (editor != null && editor.NewItemTypes?.Count > 0 && editor.Items.Count == 0)
+                {
+                    var newItem = Activator.CreateInstance(editor.NewItemTypes.First());
+                    editor.ContentItemAddExternal(newItem as BaseContent);
+                    editor.SelectedItem = newItem;
+                }
+            });
+        }
+
+        private void _collectionControl_Loaded(object sender, RoutedEventArgs e)
+        {
+            _collectionControl.PropertyGrid.PropertyValueChanged -= PropertyGrid_PropertyValueChanged;
+            _collectionControl.PropertyGrid.PropertyValueChanged += PropertyGrid_PropertyValueChanged;
+        }
+
+        private void PropertyGrid_PropertyValueChanged(object sender, PropertyValueChangedEventArgs e)
+        {
+            InvalidateSource();
+
+            if ((e.Source as PropertyGrid).SelectedObject is BaseEntity bEntity && (e.OriginalSource is PropertyItem pItem))
+            {
+                if (pItem.PropertyName == nameof(bEntity.Alias)) //If name of the property changed is 'Alias'
+                {
+                    var editor = editorWindow.ChatElementContentCollectionEditor;
+                    if (editor.SelectedItem != null) //copy alias to content only when 1 content is present
+                    {
+                        if (editor.SelectedItem is ButtonContent bContent && string.IsNullOrWhiteSpace(bContent.ButtonText))
+                            bContent.ButtonText = e.NewValue as string;
+                        else if (editor.SelectedItem is TextSectionContent txtContent && string.IsNullOrWhiteSpace(txtContent.SectionText))
+                            txtContent.SectionText = e.NewValue as string;
+                        else if (editor.SelectedItem is CarouselButtonContent cBtnContent && string.IsNullOrWhiteSpace(cBtnContent.ButtonText))
+                            cBtnContent.ButtonText = e.NewValue as string;
+                        else if (editor.SelectedItem is CarouselItemContent cItemContent && string.IsNullOrWhiteSpace(cItemContent.Title))
+                            cItemContent.Title = e.NewValue as string;
+                    }
+                }
+            }
+        }
+        private void InvalidatePropertyGrid()
+        {
+            if (_collectionControl.PropertyGrid != null && _collectionControl.PropertyGrid.SelectedObject != null)
+                _collectionControl.PropertyGrid.Update();
+        }
+        private void InvalidateSource()
+        {
+            _propertyItem.Value = new ObservableCollection<T>(_collectionControl.Items.Cast<T>());
+        }
+
+        private void ItemAdding(object sender, ItemAddingEventArgs e)
+        {
+            var Item = e.Item;
+
+            if (Item is BaseIdEntity)
+                (Item as BaseIdEntity)._id = ObjectId.GenerateNewId().ToString();
+            if (Item is BaseEntity)
+                (Item as BaseEntity).Alias = "New " + Item.GetType().Name;
+        }
+
+        private void ItemCollectionChanged(object sender, ItemEventArgs e)
+        {
+            InvalidateSource();
+        }
+    }
+}
\ No newline at end of file
diff --git a/ANAConversationStudio/Controls/ChatNodeCollectionEditor.cs b/ANAConversationStudio/Controls/ChatNodeCollectionEditor.cs
index 1a8f8db..f666867 100644
--- a/ANAConversationStudio/Controls/ChatNodeCollectionEditor.cs
+++ b/ANAConversationStudio/Controls/ChatNodeCollectionEditor.cs
@@ -98,6 +98,12 @@ private void PropertyGrid_PropertyValueChanged(object sender, PropertyValueChang
                             bContent.ButtonText = e.NewValue as string;
                         else if (editor.SelectedItem is TextSectionContent txtContent && string.IsNullOrWhiteSpace(txtContent.SectionText))
                             txtContent.SectionText = e.NewValue as string;
+                        else if (editor.SelectedItem is TitleCaptionSectionContent titleCaptionSectionContent && string.IsNullOrWhiteSpace(titleCaptionSectionContent.Title))
+                            titleCaptionSectionContent.Title = e.NewValue as string;
+                        else if (editor.SelectedItem is CarouselButtonContent cBtnContent && string.IsNullOrWhiteSpace(cBtnContent.ButtonText))
+                            cBtnContent.ButtonText = e.NewValue as string;
+                        else if (editor.SelectedItem is CarouselItemContent cItemContent && string.IsNullOrWhiteSpace(cItemContent.Title))
+                            cItemContent.Title = e.NewValue as string;
                     }
                 }
             }
diff --git a/ANAConversationStudio/Controls/ReadonlyTextBoxEditor.cs b/ANAConversationStudio/Controls/ReadonlyTextBoxEditor.cs
new file mode 100644
index 0000000..c652d4c
--- /dev/null
+++ b/ANAConversationStudio/Controls/ReadonlyTextBoxEditor.cs
@@ -0,0 +1,23 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using Xceed.Wpf.Toolkit.PropertyGrid;
+using Xceed.Wpf.Toolkit.PropertyGrid.Editors;
+
+namespace ANAConversationStudio.Controls
+{
+    public class ReadonlyTextBoxEditor : TextBoxEditor
+    {
+        public override FrameworkElement ResolveEditor(PropertyItem propertyItem)
+        {
+            var editor = base.ResolveEditor(propertyItem);
+            (editor as TextBox).IsReadOnly = true;
+            (editor as TextBox).IsReadOnlyCaretVisible = true;
+            return editor;
+        }
+    }
+}
diff --git a/ANAConversationStudio/Helpers/MongoHelper.cs b/ANAConversationStudio/Helpers/MongoHelper.cs
index 2f0c9e1..6f746f5 100644
--- a/ANAConversationStudio/Helpers/MongoHelper.cs
+++ b/ANAConversationStudio/Helpers/MongoHelper.cs
@@ -65,6 +65,15 @@ public MongoHelper(DatabaseConnection connection)
 
             if (!BsonClassMap.IsClassMapRegistered(typeof(ButtonContent)))
                 BsonClassMap.RegisterClassMap<ButtonContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(PrintOTPSection)))
+                BsonClassMap.RegisterClassMap<PrintOTPSection>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselButtonContent)))
+                BsonClassMap.RegisterClassMap<CarouselButtonContent>();
+
+            if (!BsonClassMap.IsClassMapRegistered(typeof(CarouselItemContent)))
+                BsonClassMap.RegisterClassMap<CarouselItemContent>();
             #endregion
             _connection = connection;
         }
diff --git a/ANAConversationStudio/Helpers/Settings.cs b/ANAConversationStudio/Helpers/Settings.cs
index 3054e42..52879a5 100644
--- a/ANAConversationStudio/Helpers/Settings.cs
+++ b/ANAConversationStudio/Helpers/Settings.cs
@@ -1,4 +1,6 @@
-using Newtonsoft.Json;
+using ANAConversationStudio.Models;
+using Newtonsoft.Json;
+using System;
 using System.Collections.Generic;
 using System.IO;
 
@@ -9,16 +11,32 @@ public class Settings
         const string FILE_NAME = "Settings.json";
 
         public List<DatabaseConnection> SavedConnections { get; set; } = new List<DatabaseConnection>();
+        public EditableSettings UpdateDetails { get; set; } = new EditableSettings();
+        public static bool IsEncrypted()
+        {
+            try
+            {
+                if (!File.Exists(FILE_NAME)) return false;
 
-        public static Settings Load()
+                JsonConvert.DeserializeObject<Settings>(File.ReadAllText(FILE_NAME));
+                //If the settings file gets parsed without decryption, it means, the password is not set yet.
+                return false;
+            }
+            catch
+            {
+                return true;
+            }
+        }
+        public static Settings Load(string password)
         {
             if (File.Exists(FILE_NAME))
-                return JsonConvert.DeserializeObject<Settings>(File.ReadAllText(FILE_NAME));
+                return JsonConvert.DeserializeObject<Settings>(Utilities.Decrypt(File.ReadAllText(FILE_NAME), password));
             return new Settings();
         }
-        public void Save()
+
+        public void Save(string password)
         {
-            File.WriteAllText(FILE_NAME, JsonConvert.SerializeObject(this));
+            File.WriteAllText(FILE_NAME, Utilities.Encrypt(JsonConvert.SerializeObject(this), password));
         }
     }
 
@@ -44,4 +62,15 @@ public bool IsValid()
             return Utilities.ValidateStrings(TemplateCollectionName, ContentCollectionName, LayoutCollectionName, DatabaseName, ConnectionString, Name);
         }
     }
+
+    public class EditableSettings
+    {
+        public string StudioUpdateUrl { get; set; }
+    }
+
+    public class AutoUpdateResponse
+    {
+        public string DownloadLink { get; set; }
+        public Version Version { get; set; }
+    }
 }
diff --git a/ANAConversationStudio/Helpers/Utilities.cs b/ANAConversationStudio/Helpers/Utilities.cs
index e34d493..1cd4636 100644
--- a/ANAConversationStudio/Helpers/Utilities.cs
+++ b/ANAConversationStudio/Helpers/Utilities.cs
@@ -12,17 +12,19 @@
 using Serilog;
 using System.Runtime.CompilerServices;
 using System.IO;
+using System.Net;
+using System.Threading.Tasks;
+using Newtonsoft.Json;
+using System.Reflection;
+using System.Security.Cryptography;
+using System.Text;
 
 namespace ANAConversationStudio.Helpers
 {
     public static class Utilities
     {
         public static Settings Settings { get; set; }
-        static Utilities()
-        {
-            Settings = Settings.Load();
-        }
-
+        
         public static BaseContent GetContentObject(object contentOwner)
         {
             BaseContent contentObj = null;
@@ -40,21 +42,21 @@ public static BaseContent GetContentObject(object contentOwner)
         }
         public static IEnumerable<BaseContent> GetContentBank(object choosenOwner)
         {
-            if (choosenOwner is ChatNode)
-            {
-                var node = choosenOwner as ChatNode;
+            if (choosenOwner is ChatNode node)
                 return MongoHelper.Current.Contents.Where(x => x is NodeContent).Cast<NodeContent>().Where(x => x.NodeId == node.Id).ToList();
-            }
-            if (choosenOwner is Section)
-            {
-                var section = choosenOwner as Section;
+
+            if (choosenOwner is Section section)
                 return MongoHelper.Current.Contents.Where(x => x is SectionContent).Cast<SectionContent>().Where(x => x.SectionId == section._id).ToList();
-            }
-            if (choosenOwner is Button)
-            {
-                var btn = choosenOwner as Button;
+
+            if (choosenOwner is Button btn)
                 return MongoHelper.Current.Contents.Where(x => x is ButtonContent).Cast<ButtonContent>().Where(x => x.ButtonId == btn._id).ToList();
-            }
+
+            if (choosenOwner is CarouselItem cItem)
+                return MongoHelper.Current.Contents.Where(x => x is CarouselItemContent).Cast<CarouselItemContent>().Where(x => x.CarouselItemId == cItem._id).ToList();
+
+            if (choosenOwner is CarouselButton cButton)
+                return MongoHelper.Current.Contents.Where(x => x is CarouselButtonContent).Cast<CarouselButtonContent>().Where(x => x.CarouselButtonId == cButton._id).ToList();
+
             return new List<BaseContent>();
         }
         public static void UpdateContentBank(IEnumerable<BaseContent> editedContentEntries)
@@ -87,8 +89,11 @@ public static BaseContent GetContentObjectV2(object contentOwner)
                 contentObj = new NodeContent();
             else if (contentOwner is Button)
                 contentObj = new ButtonContent();
+            else if (contentOwner is CarouselItem)
+                contentObj = new CarouselItemContent();
+            else if (contentOwner is CarouselButton)
+                contentObj = new CarouselButtonContent();
             return contentObj;
-
         }
 
         static Random rand = new Random();
@@ -108,6 +113,63 @@ public static bool ValidateStrings(params string[] strings)
                 if (string.IsNullOrWhiteSpace(item)) return false;
             return true;
         }
+
+        public static async Task<AutoUpdateResponse> GetLatestVersionInfo()
+        {
+            if (Settings.UpdateDetails != null && !string.IsNullOrWhiteSpace(Settings.UpdateDetails.StudioUpdateUrl))
+            {
+                using (var wc = new WebClient())
+                {
+                    var resp = await wc.DownloadStringTaskAsync(Settings.UpdateDetails.StudioUpdateUrl);
+                    return JsonConvert.DeserializeObject<AutoUpdateResponse>(resp);
+                }
+            }
+            return null;
+        }
+
+        public static string Encrypt(string encryptString, string encryptionKey)
+        {
+            byte[] clearBytes = Encoding.Unicode.GetBytes(encryptString);
+            using (Aes encryptor = Aes.Create())
+            {
+                Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(encryptionKey, new byte[] { 0x49, 0x76, 0x61, 0x6e, 0x20, 0x4d, 0x65, 0x64, 0x76, 0x65, 0x64, 0x65, 0x76 });
+                encryptor.Key = pdb.GetBytes(32);
+                encryptor.IV = pdb.GetBytes(16);
+                using (MemoryStream ms = new MemoryStream())
+                {
+                    using (CryptoStream cs = new CryptoStream(ms, encryptor.CreateEncryptor(), CryptoStreamMode.Write))
+                    {
+                        cs.Write(clearBytes, 0, clearBytes.Length);
+                        cs.Close();
+                    }
+                    encryptString = Convert.ToBase64String(ms.ToArray());
+                }
+            }
+            return encryptString;
+        }
+
+        public static string Decrypt(string cipherText, string encryptionKey)
+        {
+            cipherText = cipherText.Replace(" ", "+");
+            byte[] cipherBytes = Convert.FromBase64String(cipherText);
+            using (Aes encryptor = Aes.Create())
+            {
+                Rfc2898DeriveBytes pdb = new Rfc2898DeriveBytes(encryptionKey, new byte[] { 0x49, 0x76, 0x61, 0x6e, 0x20, 0x4d, 0x65, 0x64, 0x76, 0x65, 0x64, 0x65, 0x76 });
+                encryptor.Key = pdb.GetBytes(32);
+                encryptor.IV = pdb.GetBytes(16);
+                using (MemoryStream ms = new MemoryStream())
+                {
+                    using (CryptoStream cs = new CryptoStream(ms, encryptor.CreateDecryptor(), CryptoStreamMode.Write))
+                    {
+                        cs.Write(cipherBytes, 0, cipherBytes.Length);
+                        cs.Close();
+                    }
+                    cipherText = Encoding.Unicode.GetString(ms.ToArray());
+                }
+            }
+            return cipherText;
+        }
+
     }
 
     public static class Exts
diff --git a/ANAConversationStudio/Models/Chat/BaseContent.cs b/ANAConversationStudio/Models/Chat/BaseContent.cs
index 40519c7..2c9d96c 100644
--- a/ANAConversationStudio/Models/Chat/BaseContent.cs
+++ b/ANAConversationStudio/Models/Chat/BaseContent.cs
@@ -2,6 +2,7 @@
 using ANAConversationStudio.Views;
 using System.ComponentModel;
 using System.Linq;
+using ANAConversationStudio.Controls;
 
 namespace ANAConversationStudio.Models
 {
@@ -28,7 +29,7 @@ public string NodeName
         }
 
         private string _NodeId;
-        [ReadOnly(true)]
+        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string NodeId
         {
             get { return _NodeId; }
@@ -76,7 +77,7 @@ public string NodeHeaderText
     public class SectionContent : BaseContent
     {
         private string _SectionId;
-        [ReadOnly(true)]
+        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string SectionId
         {
             get { return _SectionId; }
@@ -232,7 +233,7 @@ public string CoordinateText
     public class ButtonContent : BaseContent
     {
         private string _ButtonId;
-        [ReadOnly(true)]
+        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string ButtonId
         {
             get { return _ButtonId; }
@@ -261,4 +262,85 @@ public string ButtonText
             }
         }
     }
+
+    public class CarouselButtonContent : BaseContent
+    {
+        private string _CarouselButtonId;
+        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
+        public string CarouselButtonId
+        {
+            get { return _CarouselButtonId; }
+            set
+            {
+                if (_CarouselButtonId != value)
+                {
+                    _CarouselButtonId = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _ButtonText;
+        [Category("Important")]
+        public string ButtonText
+        {
+            get { return _ButtonText; }
+            set
+            {
+                if (_ButtonText != value)
+                {
+                    _ButtonText = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+    }
+
+    public class CarouselItemContent : BaseContent
+    {
+        private string _CarouselItemId;
+        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
+        public string CarouselItemId
+        {
+            get { return _CarouselItemId; }
+            set
+            {
+                if (_CarouselItemId != value)
+                {
+                    _CarouselItemId = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _Title;
+        [Category("Important")]
+        public string Title
+        {
+            get { return _Title; }
+            set
+            {
+                if (_Title != value)
+                {
+                    _Title = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _Caption;
+        [Category("Important")]
+        public string Caption
+        {
+            get { return _Caption; }
+            set
+            {
+                if (_Caption != value)
+                {
+                    _Caption = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+    }
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Models/Chat/BaseEntity.cs b/ANAConversationStudio/Models/Chat/BaseEntity.cs
index 2a211f8..fc36be9 100644
--- a/ANAConversationStudio/Models/Chat/BaseEntity.cs
+++ b/ANAConversationStudio/Models/Chat/BaseEntity.cs
@@ -1,4 +1,5 @@
-using System;
+using ANAConversationStudio.Controls;
+using System;
 using System.ComponentModel;
 using System.Runtime.CompilerServices;
 
@@ -10,7 +11,7 @@ public class BaseIdEntity : INotifyPropertyChanged
         protected void OnPropertyChanged([CallerMemberName]string propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
 
         private string __id;
-        [ReadOnly(true)]
+        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string _id
         {
             get { return __id; }
@@ -27,7 +28,7 @@ public string _id
     public class BaseIdTimeStampEntity : BaseIdEntity
     {
         private DateTime _CreatedOn;
-        [ReadOnly(true)]
+        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public DateTime CreatedOn
         {
             get { return _CreatedOn; }
@@ -42,7 +43,7 @@ public DateTime CreatedOn
         }
 
         private DateTime _UpdatedOn;
-        [ReadOnly(true)]
+        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public DateTime UpdatedOn
         {
             get { return _UpdatedOn; }
diff --git a/ANAConversationStudio/Models/Chat/Button.cs b/ANAConversationStudio/Models/Chat/Button.cs
index fdcb351..164abe8 100644
--- a/ANAConversationStudio/Models/Chat/Button.cs
+++ b/ANAConversationStudio/Models/Chat/Button.cs
@@ -1,4 +1,5 @@
-using System.ComponentModel;
+using ANAConversationStudio.Controls;
+using System.ComponentModel;
 using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
 
 namespace ANAConversationStudio.Models.Chat
@@ -87,24 +88,54 @@ public string PostfixText
                 }
             }
         }
+        #endregion
 
-        private bool _ConfirmInput;
-        [Category("For ButtonType Get[X]")]
-        public bool ConfirmInput
+        #region Misc
+        private bool _PostToChat = true;
+        [Category("Misc")]
+        public bool PostToChat
         {
-            get { return _ConfirmInput; }
+            get { return _PostToChat; }
             set
             {
-                if (_ConfirmInput != value)
+                if (_PostToChat != value)
                 {
-                    _ConfirmInput = value;
+                    _PostToChat = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _APIResponseMatchKey;
+        [Category("Misc")]
+        public string APIResponseMatchKey
+        {
+            get { return _APIResponseMatchKey; }
+            set
+            {
+                if (_APIResponseMatchKey != value)
+                {
+                    _APIResponseMatchKey = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _APIResponseMatchValue;
+        [Category("Misc")]
+        public string APIResponseMatchValue
+        {
+            get { return _APIResponseMatchValue; }
+            set
+            {
+                if (_APIResponseMatchValue != value)
+                {
+                    _APIResponseMatchValue = value;
                     OnPropertyChanged();
                 }
             }
         }
-        #endregion
 
-        #region Misc
         private string _DeepLinkUrl;
         [Category("Misc")]
         public string DeepLinkUrl
@@ -181,7 +212,7 @@ public bool Hidden
         }
 
         private string _NextNodeId;
-        [ReadOnly(true)]
+        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string NextNodeId
         {
             get { return _NextNodeId; }
@@ -217,5 +248,6 @@ public enum ButtonTypeEnum
         NextNode,
         DeepLink,
         GetAgent,
+        ShowConfirmation
     }
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Models/Chat/ChatNode.cs b/ANAConversationStudio/Models/Chat/ChatNode.cs
index 569f680..8c72091 100644
--- a/ANAConversationStudio/Models/Chat/ChatNode.cs
+++ b/ANAConversationStudio/Models/Chat/ChatNode.cs
@@ -13,7 +13,8 @@ namespace ANAConversationStudio.Models.Chat
 {
     [CategoryOrder("Important", 1)]
     [CategoryOrder("For NodeType ApiCall", 2)]
-    [CategoryOrder("Misc", 3)]
+    [CategoryOrder("For NodeType Card", 3)]
+    [CategoryOrder("Misc", 4)]
     public class ChatNode : INotifyPropertyChanged
     {
         public ChatNode()
@@ -55,7 +56,7 @@ public NodeTypeEnum NodeType
         }
 
         private ObservableCollection<Section> _Sections = new ObservableCollection<Section>();
-        [NewItemTypes(typeof(TextSection), typeof(GifSection), typeof(ImageSection), typeof(GraphSection), typeof(AudioSection), typeof(VideoSection))]
+        [NewItemTypes(typeof(TextSection), typeof(GifSection), typeof(ImageSection), typeof(GraphSection), typeof(AudioSection), typeof(VideoSection), typeof(CarouselSection), typeof(PrintOTPSection))]
         [Category("Important")]
         [PropertyOrder(3)]
         [Editor(typeof(ChatNodeCollectionEditor<Section>), typeof(ChatNodeCollectionEditor<Section>))]
@@ -88,14 +89,12 @@ public ObservableCollection<Button> Buttons
                 }
             }
         }
-
-        
         #endregion
 
         #region Misc
         private string _Id;
         [Category("Misc")]
-        [ReadOnly(true)]
+        [Editor(typeof(ReadonlyTextBoxEditor), typeof(ReadonlyTextBoxEditor))]
         public string Id
         {
             get { return _Id; }
@@ -232,6 +231,56 @@ public string NextNodeId
         }
         #endregion
 
+        #region For NodeType Card
+        private string _CardHeader;
+        [Category("For NodeType Card")]
+        [PropertyOrder(11)]
+        public string CardHeader
+        {
+            get { return _CardHeader; }
+            set
+            {
+                if (_CardHeader != value)
+                {
+                    _CardHeader = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private string _CardFooter;
+        [Category("For NodeType Card")]
+        [PropertyOrder(12)]
+        public string CardFooter
+        {
+            get { return _CardFooter; }
+            set
+            {
+                if (_CardFooter != value)
+                {
+                    _CardFooter = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+
+        private Placement? _Placement;
+        [Category("For NodeType Card")]
+        [PropertyOrder(13)]
+        public Placement? Placement
+        {
+            get { return _Placement; }
+            set
+            {
+                if (_Placement != value)
+                {
+                    _Placement = value;
+                    OnPropertyChanged();
+                }
+            }
+        }
+        #endregion
+
         public event PropertyChangedEventHandler PropertyChanged;
         private void OnPropertyChanged([CallerMemberName]string propertyName = null) => PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
         public override string ToString()
@@ -257,11 +306,16 @@ public enum ApiMethodEnum
 
     public enum NodeTypeEnum
     {
-        ApiCall, Combination
+        ApiCall, Combination, Card
     };
 
     public enum EmotionEnum
     {
         Cool, Happy, Excited, Neutral, Sad, Irritated, Angry
     };
+
+    public enum Placement
+    {
+        Incoming, Outgoing, Center
+    }
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Models/Chat/Sections/CarouselSection.cs b/ANAConversationStudio/Models/Chat/Sections/CarouselSection.cs
index 882a498..b4f589e 100644
--- a/ANAConversationStudio/Models/Chat/Sections/CarouselSection.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/CarouselSection.cs
@@ -1,4 +1,9 @@
-using System.Collections.Generic;
+using ANAConversationStudio.Controls;
+using MongoDB.Bson;
+using System.Collections.Generic;
+using System.Collections.ObjectModel;
+using System.ComponentModel;
+using System.Linq;
 
 namespace ANAConversationStudio.Models.Chat.Sections
 {
@@ -8,36 +13,31 @@ public CarouselSection()
         {
             SectionType = SectionTypeEnum.Carousel;
         }
-        public List<Carousel> CarouselList { get; set; } = new List<Carousel>();
 
-        public void AddNewCarouselEntry(Carousel carouselEntry)
-        {
-            if (CarouselList == null)
-                CarouselList = new List<Carousel>();
-            CarouselList.Add(carouselEntry);
-        }
+        [Editor(typeof(ChatElementCollectionEditor<CarouselItem>), typeof(ChatElementCollectionEditor<CarouselItem>))]
+        public ObservableCollection<CarouselItem> Items { get; set; } = new ObservableCollection<CarouselItem>();
     }
 
-    public class Carousel
+    public class CarouselItem : BaseEntity
     {
-        public override string ToString()
-        {
-            return Title;
-        }
-        public Carousel() { }
-        public Carousel(string title, string imageUrl)
-        {
-            this.Title = title;
-            this.ImageUrl = imageUrl;
-        }
-        public string Title { get; set; }
-        public string ImageUrl { get; set; } = null;
-        public List<string> Values { get; set; } = new List<string>();
-        public void AddValue(string value)
-        {
-            if (Values == null)
-                Values = new List<string>();
-            Values.Add(value);
-        }
+        public string ImageUrl { get; set; }
+
+        [Editor(typeof(ChatElementCollectionEditor<CarouselButton>), typeof(ChatElementCollectionEditor<CarouselButton>))]
+        public ObservableCollection<CarouselButton> Buttons { get; set; } = new ObservableCollection<CarouselButton>();
+    }
+
+    public class CarouselButton : BaseEntity
+    {
+        public string Url { get; set; }
+        public CardButtonType Type { get; set; }
+        public string VariableValue { get; set; }
+        public string NextNodeId { get; set; }
+    }
+
+    public enum CardButtonType
+    {
+        NextNode,
+        DeepLink,
+        OpenUrl
     }
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Models/Chat/Sections/PrintOTPSection.cs b/ANAConversationStudio/Models/Chat/Sections/PrintOTPSection.cs
new file mode 100644
index 0000000..2f35699
--- /dev/null
+++ b/ANAConversationStudio/Models/Chat/Sections/PrintOTPSection.cs
@@ -0,0 +1,13 @@
+using ANAConversationStudio.Models.Chat;
+
+namespace ANAConversationStudio.Models.Chat.Sections
+{
+    public class PrintOTPSection : Section
+    {
+        public int Length { get; set; }
+        public PrintOTPSection()
+        {
+            SectionType = SectionTypeEnum.PrintOTP;
+        }
+    }
+}
diff --git a/ANAConversationStudio/Models/Chat/Sections/Section.cs b/ANAConversationStudio/Models/Chat/Sections/Section.cs
index dcc14e4..2253f53 100644
--- a/ANAConversationStudio/Models/Chat/Sections/Section.cs
+++ b/ANAConversationStudio/Models/Chat/Sections/Section.cs
@@ -18,6 +18,6 @@ public Section() { }
 
     public enum SectionTypeEnum
     {
-        Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml, Carousel
+        Image, Text, Graph, Gif, Audio, Video, Link, EmbeddedHtml, Carousel, PrintOTP
     };
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Properties/AssemblyInfo.cs b/ANAConversationStudio/Properties/AssemblyInfo.cs
index 83fffbb..461de35 100644
--- a/ANAConversationStudio/Properties/AssemblyInfo.cs
+++ b/ANAConversationStudio/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 // You can specify all the values or you can default the Build and Revision Numbers 
 // by using the '*' as shown below:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("3.12.0.0")]
-[assembly: AssemblyFileVersion("3.12.0.0")]
+[assembly: AssemblyVersion("3.26.0.0")]
+[assembly: AssemblyFileVersion("3.26.0.0")]
diff --git a/ANAConversationStudio/Tools/7za.exe b/ANAConversationStudio/Tools/7za.exe
new file mode 100644
index 0000000..292f0eb
Binary files /dev/null and b/ANAConversationStudio/Tools/7za.exe differ
diff --git a/ANAConversationStudio/Tools/extract.bat b/ANAConversationStudio/Tools/extract.bat
new file mode 100644
index 0000000..13639bf
--- /dev/null
+++ b/ANAConversationStudio/Tools/extract.bat
@@ -0,0 +1,5 @@
+@echo off
+cls
+timeout 5
+7za.exe x %1 -o%2 -aoa
+pause
\ No newline at end of file
diff --git a/ANAConversationStudio/ViewModels/MainWindowViewModel.cs b/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
index aba4be0..56b7ff9 100644
--- a/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
+++ b/ANAConversationStudio/ViewModels/MainWindowViewModel.cs
@@ -265,10 +265,10 @@ public void QueryConnnectionFeedback(ConnectorViewModel draggedOutConnector, Con
                 //
                 // Only allow connections from output connector to input connector (ie each
                 // connector must have a different type).
-                // Also only allocation from one node to another, never one node back to the same node.
                 //
-                connectionOk = sourceConnector.ParentNode != destConnector.ParentNode &&
-                                 sourceConnector.Type != destConnector.Type;
+                //(Also only allocation from one node to another, never one node back to the same node.) Condition Removed
+                //connectorDraggedOut.ParentNode != connectorDraggedOver.ParentNode && 
+                connectionOk = sourceConnector.Type != destConnector.Type;
 
                 if (connectionOk)
                 {
@@ -324,10 +324,10 @@ public void ConnectionDragCompleted(ConnectionViewModel newConnection, Connector
             //
             // Only allow connections from output connector to input connector (ie each
             // connector must have a different type).
-            // Also only allocation from one node to another, never one node back to the same node.
-            //
-            bool connectionOk = connectorDraggedOut.ParentNode != connectorDraggedOver.ParentNode &&
-                                connectorDraggedOut.Type != connectorDraggedOver.Type;
+            // 
+            //(Also only allocation from one node to another, never one node back to the same node.) Condition Removed
+            //connectorDraggedOut.ParentNode != connectorDraggedOver.ParentNode && 
+            bool connectionOk = connectorDraggedOut.Type != connectorDraggedOver.Type;
 
             if (!connectionOk)
             {
@@ -430,7 +430,7 @@ public void DeleteNode(NodeViewModel node, bool askConfirmation = true)
             if (askConfirmation)
                 if (MessageBox.Show("Do you want to delete '" + node.Name + "' node?", "Confirm", MessageBoxButton.YesNo) != MessageBoxResult.Yes)
                     return;
-            
+
             //
             // Remove all connections attached to the node.
             //
@@ -545,17 +545,16 @@ public void SaveChatNodes()
         {
             MongoHelper.Current.SaveChatNodes(this.Network.Nodes.Select(x => x.ChatNode).ToList());
         }
-        public void LoadNodesFromDB()
+        public bool LoadNodesFromDB()
         {
             try
             {
-
                 if (MongoHelper.Current == null)
                 {
                     MessageBox.Show("Database Connection is not yet selected.", "Oops!");
-                    return;
+                    return false;
                 }
-                
+
                 this.Network = new NetworkViewModel();
                 this.Network.Connections.CollectionChanged += Connections_CollectionChanged;
 
@@ -583,12 +582,14 @@ public void LoadNodesFromDB()
                         }
                     }
                 }
+                return true;
             }
             catch (Exception ex)
             {
                 if (!Utilities.IsDesignMode())
                     MessageBox.Show(ex.ToString(), "Initialization error");
             }
+            return false;
         }
 
         private void Connections_CollectionChanged(object sender, System.Collections.Specialized.NotifyCollectionChangedEventArgs e)
diff --git a/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml b/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml
new file mode 100644
index 0000000..6961d3d
--- /dev/null
+++ b/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml
@@ -0,0 +1,18 @@
+<Window x:Class="ANAConversationStudio.Views.ChatElementCollectionEditorWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:Controls="clr-namespace:ANAConversationStudio.Controls"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:ANAConversationStudio.Views"
+        mc:Ignorable="d"
+        Height="400" Width="1366">
+    <Grid>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition />
+            <ColumnDefinition />
+        </Grid.ColumnDefinitions>
+        <ContentControl x:Name="ElementEditor"/>
+        <Controls:ChatContentCollectionControl x:Name="ChatElementContentCollectionEditor" Grid.Column="1" ParentChatNode="{Binding Path=Content.OwnerChatNode, ElementName=ElementEditor}" ChatContentOwner="{Binding ElementName=ElementEditor, Path=Content.SelectedItem, Mode=TwoWay, FallbackValue=null}"/>
+    </Grid>
+</Window>
diff --git a/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml.cs b/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml.cs
new file mode 100644
index 0000000..cfeed6d
--- /dev/null
+++ b/ANAConversationStudio/Views/ChatElementCollectionEditorWindow.xaml.cs
@@ -0,0 +1,26 @@
+using System.Windows;
+using Xceed.Wpf.Toolkit;
+
+namespace ANAConversationStudio.Views
+{
+    /// <summary>
+    /// Interaction logic for ChatElementCollectionEditorWindow.xaml
+    /// </summary>
+    public partial class ChatElementCollectionEditorWindow : Window
+    {
+        public ChatElementCollectionEditorWindow()
+        {
+            InitializeComponent();
+        }
+
+        public ChatElementCollectionEditorWindow(CollectionControl control)
+        {
+            InitializeComponent();
+            if (control.ItemsSourceType.GenericTypeArguments != null && control.ItemsSourceType.GenericTypeArguments.Length > 0)
+                Title = $"Edit {control.ItemsSourceType.GenericTypeArguments[0].Name}";
+            else
+                Title = "Edit Element and its content";
+            ElementEditor.Content = control;
+        }
+    }
+}
diff --git a/ANAConversationStudio/Views/DBConnectionManager.xaml b/ANAConversationStudio/Views/DBConnectionManager.xaml
index 0a63ced..ac01ac6 100644
--- a/ANAConversationStudio/Views/DBConnectionManager.xaml
+++ b/ANAConversationStudio/Views/DBConnectionManager.xaml
@@ -23,8 +23,9 @@
                     <Setter Property="MinWidth" Value="100"/>
                 </Style>
             </StackPanel.Resources>
-            <Button Content="Open Selected Connection" Click="ConnectToSelectedClick" IsEnabled="{Binding ElementName=CollectionControl, Path=SelectedItem, Converter={StaticResource N2B}}"/>
             <Button Content="Save and Close" Click="SaveClick"/>
+            <Button Content="Save and Connect" Click="SaveAndConnectClick" IsEnabled="{Binding ElementName=CollectionControl, Path=SelectedItem, Converter={StaticResource N2B}}"/>
+            <Button Content="Cancel" Click="CancelClick"/>
         </StackPanel>
     </Grid>
 </Window>
diff --git a/ANAConversationStudio/Views/DBConnectionManager.xaml.cs b/ANAConversationStudio/Views/DBConnectionManager.xaml.cs
index 060f258..fe9e89b 100644
--- a/ANAConversationStudio/Views/DBConnectionManager.xaml.cs
+++ b/ANAConversationStudio/Views/DBConnectionManager.xaml.cs
@@ -26,7 +26,7 @@ public DBConnectionManager(List<DatabaseConnection> databaseConnections)
         {
             InitializeComponent();
             this.Closing += DBConnectionManager_Closing;
-            CollectionControl.ItemsSource = databaseConnections;
+            CollectionControl.ItemsSource = databaseConnections.DeepCopy();
             CollectionControl.ItemsSourceType = typeof(ObservableCollection<DatabaseConnection>);
             CollectionControl.NewItemTypes = new List<Type>() { typeof(DatabaseConnection) };
         }
@@ -78,16 +78,55 @@ private bool Save()
                     return false;
                 }
                 Utilities.Settings.SavedConnections = conns;
-                Utilities.Settings.Save();
+                Utilities.Settings.Save(App.Cryptio);
             }
             return true;
         }
 
         private void SaveClick(object sender, RoutedEventArgs e)
         {
-            Save();
+            if (Save())
+            {
+                HideConfirm = true;
+                Close();
+            }
+        }
+
+        private void CancelClick(object sender, RoutedEventArgs e)
+        {
             HideConfirm = true;
             Close();
         }
+
+        private void SaveAndConnectClick(object sender, RoutedEventArgs e)
+        {
+            if (CollectionControl.SelectedItem as DatabaseConnection != null)
+            {
+                try
+                {
+                    if (!(CollectionControl.SelectedItem as DatabaseConnection).IsValid())
+                    {
+                        MessageBox.Show("The connection details are invalid. Please correct them and try again.", "Oops!");
+                        return;
+                    }
+                    MongoHelper.Current = new MongoHelper(CollectionControl.SelectedItem as DatabaseConnection);
+                    var connected = MainWindow.Current.ViewModel.LoadNodesFromDB();
+                    if (connected)
+                    {
+                        MainWindow.Current.Status("Chat flow loaded");
+                        if (Save())
+                        {
+                            HideConfirm = true;
+                            Close();
+                        }
+                    }
+                }
+                catch (Exception ex)
+                {
+                    MongoHelper.Current = null;
+                    MainWindow.Current.Status("Unable to connect to the database");
+                }
+            }
+        }
     }
 }
diff --git a/ANAConversationStudio/Views/EnterPassword.xaml b/ANAConversationStudio/Views/EnterPassword.xaml
new file mode 100644
index 0000000..638d497
--- /dev/null
+++ b/ANAConversationStudio/Views/EnterPassword.xaml
@@ -0,0 +1,22 @@
+<Window x:Class="ANAConversationStudio.Views.EnterPassword"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:ANAConversationStudio.Views"
+        mc:Ignorable="d"
+        Closing="Window_Closing"
+        Title="ANA Conversation Studio" Height="300" Width="300" Icon="/ANAConversationStudio;component/favicon.ico" WindowStartupLocation="CenterScreen">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition/>
+            <RowDefinition/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <TextBlock Text="Enter the password" Name="LabelTextBlock" TextAlignment="Center" VerticalAlignment="Center" FontSize="30" Margin="10"/>
+        <PasswordBox Name="PwdBox" Grid.Row="1" VerticalAlignment="Center" FontSize="30" Margin="10" KeyDown="PwdBox_KeyDown"/>
+        <Button Content="Submit" Grid.Row="2" Padding="30,5" Margin="5" HorizontalAlignment="Center" Click="SubmitClick"/>
+        <TextBlock FontStyle="Italic" Grid.Row="3" Margin="10" Text="If you have forgot the password, delete 'Settings.json' file (which will delete your saved connections and other details) and restart the studio to set a new password." TextWrapping="Wrap"/>
+    </Grid>
+</Window>
diff --git a/ANAConversationStudio/Views/EnterPassword.xaml.cs b/ANAConversationStudio/Views/EnterPassword.xaml.cs
new file mode 100644
index 0000000..1d566fc
--- /dev/null
+++ b/ANAConversationStudio/Views/EnterPassword.xaml.cs
@@ -0,0 +1,53 @@
+using ANAConversationStudio.Helpers;
+using System.Windows;
+
+namespace ANAConversationStudio.Views
+{
+    /// <summary>
+    /// Interaction logic for EnterPassword.xaml
+    /// </summary>
+    public partial class EnterPassword : Window
+    {
+        public EnterPassword()
+        {
+            InitializeComponent();
+        }
+        public bool Success { get; set; }
+        private void SubmitClick(object sender, RoutedEventArgs e)
+        {
+            Submit();
+        }
+        private void Submit()
+        {
+            if (!string.IsNullOrWhiteSpace(PwdBox.Password))
+            {
+                try
+                {
+                    Utilities.Settings = Settings.Load(PwdBox.Password);
+                    App.Cryptio = PwdBox.Password;
+                    Success = true;
+                    Close();
+                }
+                catch (System.Exception ex)
+                {
+                    MessageBox.Show("Entered password is incorrect! Please try again.", "Incorrect password");
+                }
+            }
+        }
+
+        private void Window_Closing(object sender, System.ComponentModel.CancelEventArgs e)
+        {
+            if (!Success)
+            {
+                MainWindow.Current.AskAlert = false;
+                Application.Current.Shutdown();
+            }
+        }
+
+        private void PwdBox_KeyDown(object sender, System.Windows.Input.KeyEventArgs e)
+        {
+            if (e.Key == System.Windows.Input.Key.Enter)
+                Submit();
+        }
+    }
+}
diff --git a/ANAConversationStudio/Views/MainWindow.xaml b/ANAConversationStudio/Views/MainWindow.xaml
index 624047d..5f04842 100644
--- a/ANAConversationStudio/Views/MainWindow.xaml
+++ b/ANAConversationStudio/Views/MainWindow.xaml
@@ -55,6 +55,8 @@
             <RoutedUICommand x:Key="Commands.Fill" />
             <RoutedUICommand x:Key="Commands.OneHundredPercent" />
             <RoutedUICommand x:Key="Commands.Save" />
+            <RoutedUICommand x:Key="Commands.PrevNode" />
+            <RoutedUICommand x:Key="Commands.NextNode" />
 
             <!-- 
             This converts from a scale value to a percentage value.
@@ -459,6 +461,16 @@
             Modifiers="Alt"
 			Command="{StaticResource Commands.CloneNode}"
 			/>
+        <KeyBinding
+			Key="OemComma"
+            Modifiers="Ctrl"
+			Command="{StaticResource Commands.PrevNode}"
+			/>
+        <KeyBinding
+			Key="OemPeriod"
+            Modifiers="Ctrl"
+			Command="{StaticResource Commands.NextNode}"
+			/>
     </Window.InputBindings>
 
     <Window.CommandBindings>
@@ -514,6 +526,14 @@
             Command="{StaticResource Commands.CloneNode}" 
             Executed="CloneSelectedNode_Executed" 
             />
+        <CommandBinding 
+            Command="{StaticResource Commands.NextNode}" 
+            Executed="NextNode_Executed" 
+            />
+        <CommandBinding 
+            Command="{StaticResource Commands.PrevNode}" 
+            Executed="PrevNode_Executed" 
+            />
     </Window.CommandBindings>
 
     <Window.ContextMenu>
@@ -586,12 +606,15 @@
                     </MenuItem.ItemTemplate>
                 </MenuItem>
                 <MenuItem Header="Manage Connections" Click="ManageConnectionClick"/>
+                <MenuItem Header="Settings" Click="SettingsClick"/>
                 <MenuItem Header="Exit" Click="ExitClick"/>
             </MenuItem>
             <MenuItem Header="Tools">
                 <MenuItem Header="Launch Simulator" Click="ConvSimMenuClick"/>
             </MenuItem>
-
+            <MenuItem Header="Help" Name="HelpMenu">
+                <MenuItem Header="No update available!" Click="UpdateMenuClick" IsEnabled="False" Name="UpdateMenuItem"/>
+            </MenuItem>
         </Menu>
         <avalonDock:DockingManager Grid.Row="1" x:Name="dockingManager" >
             <avalonDock:LayoutRoot>
diff --git a/ANAConversationStudio/Views/MainWindow.xaml.cs b/ANAConversationStudio/Views/MainWindow.xaml.cs
index 88b6461..6f4af3a 100644
--- a/ANAConversationStudio/Views/MainWindow.xaml.cs
+++ b/ANAConversationStudio/Views/MainWindow.xaml.cs
@@ -12,6 +12,11 @@
 using System.Reflection;
 using Xceed.Wpf.Toolkit;
 using System.Linq;
+using System.Windows.Media;
+using System.Net;
+using System.IO;
+using System.Diagnostics;
+using System.Collections.Generic;
 
 namespace ANAConversationStudio.Views
 {
@@ -193,6 +198,88 @@ private void ConvSimMenuClick(object sender, RoutedEventArgs e)
         {
             var p = System.Diagnostics.Process.Start("anaconsim://");
         }
+
+        private async void UpdateMenuClick(object sender, RoutedEventArgs e)
+        {
+            var updateInfo = (AutoUpdateResponse)UpdateMenuItem.Tag;
+            if (updateInfo != null)
+            {
+                using (var wc = new WebClient())
+                {
+                    var tempFile = Path.GetTempFileName();
+                    File.Delete(tempFile);
+                    wc.DownloadProgressChanged += (s, args) =>
+                    {
+                        Dispatcher.Invoke(() =>
+                        {
+                            Status($"Downloading {updateInfo.Version}: {args.ProgressPercentage}% ...");
+                        });
+                    };
+                    Status("Downloading...");
+                    await wc.DownloadFileTaskAsync(updateInfo.DownloadLink, tempFile);
+                    Status("Download Complete");
+                    if (System.Windows.MessageBox.Show("Update is ready to be installed. Click ok to install. It will close the application. You can start the studio as soon as it's extraction is done", "Update", MessageBoxButton.OKCancel) == MessageBoxResult.OK)
+                    {
+                        var tempPath = Path.GetTempPath();
+                        var srcPath = Path.Combine(Environment.CurrentDirectory, "Tools");
+                        foreach (string newPath in Directory.GetFiles(srcPath, "*.*", SearchOption.AllDirectories))
+                            File.Copy(newPath, Path.Combine(tempPath, Path.GetFileName(newPath)), true);
+
+                        var extractorFilePath = Path.Combine(tempPath, "extract.bat");
+
+                        var commandLine = $"\"{tempFile}\" \"{Environment.CurrentDirectory}\"";
+                        AskAlert = false;
+                        Application.Current.Exit += (s, args) =>
+                        {
+                            var psi = new ProcessStartInfo
+                            {
+                                Arguments = commandLine,
+                                FileName = extractorFilePath,
+                                WorkingDirectory = tempPath
+                            };
+                            Process.Start(psi);
+                        };
+                        Application.Current.Shutdown();
+                    }
+                }
+            }
+        }
+
+        private void SettingsClick(object sender, RoutedEventArgs e)
+        {
+            SettingsWindow sw = new SettingsWindow(Utilities.Settings.UpdateDetails);
+            sw.ShowDialog();
+            if (sw.Save)
+            {
+                Utilities.Settings.UpdateDetails = sw.Config;
+                Utilities.Settings.Save(App.Cryptio);
+            }
+        }
+
+        private void NextNode_Executed(object sender, ExecutedRoutedEventArgs e)
+        {
+            var position = 1;
+            if (Keyboard.IsKeyDown(Key.D2))
+                position = 2;
+            if (Keyboard.IsKeyDown(Key.D3))
+                position = 3;
+            if (Keyboard.IsKeyDown(Key.D4))
+                position = 4;
+            GotoNextNode(position);
+        }
+
+        private void PrevNode_Executed(object sender, ExecutedRoutedEventArgs e)
+        {
+            var position = 1;
+
+            if (Keyboard.IsKeyDown(Key.D2))
+                position = 2;
+            if (Keyboard.IsKeyDown(Key.D3))
+                position = 3;
+            if (Keyboard.IsKeyDown(Key.D4))
+                position = 4;
+            GotoPreviousNode(position);
+        }
     }
 
     /// <summary>
@@ -703,11 +790,30 @@ public CollectionControl NodeCollectionControl
                 SectionButtonEditor.Content = value;
             }
         }
-
+        private bool AskPass()
+        {
+            if (!Settings.IsEncrypted())
+            {
+                SetPassword sp = new SetPassword();
+                sp.ShowDialog();
+                return sp.Success;
+            }
+            else
+            {
+                EnterPassword wp = new EnterPassword();
+                wp.ShowDialog();
+                return wp.Success;
+            }
+        }
         private void MainWindow_Loaded(object sender, RoutedEventArgs e)
         {
-            Title += " " + Assembly.GetExecutingAssembly().GetName().Version;
+            Title += " " + GetVersion();
+            this.IsEnabled = false;
+            if (!AskPass()) return;
+
+            this.IsEnabled = true;
             LoadSavedConnections();
+            CheckForUpdates();
 
             #region Overview Windows Commented
             //OverviewWindow overviewWindow = new OverviewWindow();
@@ -718,9 +824,31 @@ private void MainWindow_Loaded(object sender, RoutedEventArgs e)
             //overviewWindow.Show(); 
             #endregion
         }
-
+        private Version GetVersion() => Assembly.GetExecutingAssembly().GetName().Version;
+        private async void CheckForUpdates()
+        {
+            var info = await Utilities.GetLatestVersionInfo();
+            if (info != null && info.Version > GetVersion())
+            {
+                HelpMenu.Background = new SolidColorBrush(Colors.Crimson);
+                HelpMenu.Foreground = new SolidColorBrush(Colors.White);
+                UpdateMenuItem.Header = $"Update {info.Version} available!";
+                UpdateMenuItem.Foreground = new SolidColorBrush(Colors.Black);
+                UpdateMenuItem.IsEnabled = true;
+                UpdateMenuItem.Tag = info;
+            }
+            else
+            {
+                HelpMenu.Background = null;
+                HelpMenu.Foreground = new SolidColorBrush(Colors.Black);
+                UpdateMenuItem.Header = $"No update available!";
+                UpdateMenuItem.IsEnabled = false;
+            }
+        }
+        public bool AskAlert = true;
         private void MainWindow_Closing(object sender, System.ComponentModel.CancelEventArgs e)
         {
+            if (!AskAlert) return;
             var op = System.Windows.MessageBox.Show("Save changes?", "Hold on!", MessageBoxButton.YesNoCancel);
             if (op == MessageBoxResult.Cancel)
             {
@@ -809,15 +937,21 @@ private void SaveEdits()
             }
         }
 
-        private void LoadSavedConnections()
+        private bool LoadFileMenuSavedConnections()
         {
             if (Utilities.Settings.SavedConnections.Count <= 0)
             {
                 SavedConnectionsFileMenu.IsEnabled = false;
-                return;
+                return false;
             }
             SavedConnectionsFileMenu.ItemsSource = Utilities.Settings.SavedConnections;
-            LoadConnection(Utilities.Settings.SavedConnections.First());
+            SavedConnectionsFileMenu.IsEnabled = true;
+            return true;
+        }
+        private void LoadSavedConnections()
+        {
+            if (LoadFileMenuSavedConnections())
+                LoadConnection(Utilities.Settings.SavedConnections.First());
         }
         public void Status(string txt)
         {
@@ -853,11 +987,63 @@ private void ManageConnectionClick(object sender, RoutedEventArgs e)
         {
             DBConnectionManager man = new DBConnectionManager(Utilities.Settings.SavedConnections);
             man.ShowDialog();
+            LoadFileMenuSavedConnections();
         }
         private void ResetEditors()
         {
             this.ViewModel.SelectedChatNode = null;
             NodeCollectionControl = null;
         }
+
+        public void GotoNextNode(int position = 1)
+        {
+            try
+            {
+                if (this.ViewModel.SelectedChatNode != null)
+                {
+                    var nextNodeIds = new List<string>();
+                    if (this.ViewModel.SelectedChatNode.Buttons != null && this.ViewModel.SelectedChatNode.Buttons.Count > 0)
+                        nextNodeIds.AddRange(this.ViewModel.SelectedChatNode.Buttons.Select(x => x.NextNodeId));
+                    if (!string.IsNullOrWhiteSpace(this.ViewModel.SelectedChatNode.NextNodeId))
+                        nextNodeIds.Add(this.ViewModel.SelectedChatNode.NextNodeId);
+                    if (position <= nextNodeIds.Count)
+                    {
+                        var node = networkControl.Nodes.Cast<NodeViewModel>().FirstOrDefault(x => x.ChatNode.Id == nextNodeIds[position - 1]);
+                        if (node != null)
+                        {
+                            networkControl.SelectedNode = node;
+                            networkControl.BringSelectedNodesIntoView();
+                        }
+                    }
+                }
+            }
+            catch { }
+        }
+
+        public void GotoPreviousNode(int position = 1)
+        {
+            try
+            {
+                if (this.ViewModel.SelectedChatNode != null)
+                {
+                    var currentNodeId = this.ViewModel.SelectedChatNode.Id;
+
+                    var prevNodeIds = networkControl.Nodes.Cast<NodeViewModel>()
+                        .Where(x => x.ChatNode.NextNodeId == currentNodeId ||
+                        (x.ChatNode.Buttons?.Count(y => y.NextNodeId == currentNodeId) > 0)).Select(x => x.ChatNode.Id).ToList();
+
+                    if (position <= prevNodeIds.Count)
+                    {
+                        var node = networkControl.Nodes.Cast<NodeViewModel>().FirstOrDefault(x => x.ChatNode.Id == prevNodeIds[position - 1]);
+                        if (node != null)
+                        {
+                            networkControl.SelectedNode = node;
+                            networkControl.BringSelectedNodesIntoView();
+                        }
+                    }
+                }
+            }
+            catch { }
+        }
     }
 }
\ No newline at end of file
diff --git a/ANAConversationStudio/Views/SetPassword.xaml b/ANAConversationStudio/Views/SetPassword.xaml
new file mode 100644
index 0000000..f16a28d
--- /dev/null
+++ b/ANAConversationStudio/Views/SetPassword.xaml
@@ -0,0 +1,28 @@
+<Window x:Class="ANAConversationStudio.Views.SetPassword"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:local="clr-namespace:ANAConversationStudio.Views"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        mc:Ignorable="d"
+        Title="ANA Conversation Studio - Password Setup" Height="200" Width="300" MinHeight="200" MinWidth="300" Icon="/ANAConversationStudio;component/favicon.ico" WindowStartupLocation="CenterScreen">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition/>
+            <ColumnDefinition/>
+        </Grid.ColumnDefinitions>
+        <TextBlock Grid.ColumnSpan="2" Text="Please setup a password for the ANA Conversation Studio" TextWrapping="Wrap" Margin="10"/>
+        <TextBlock Text="New Password" Margin="10,10,10,5" Grid.Column="0" Grid.Row="1" VerticalAlignment="Center"/>
+        <PasswordBox Grid.Column="1" Margin="10,10,10,5" Name="NewPasswordBox" Grid.Row="1" VerticalAlignment="Center"/>
+        <TextBlock Text="Confirm Password" Grid.Column="0" Margin="10,5,10,10" Grid.Row="2" VerticalAlignment="Center"/>
+        <PasswordBox Grid.Column="2" Margin="10,5,10,10" Name="ConfirmPasswordBox" Grid.Row="2" VerticalAlignment="Center" KeyDown="ConfirmPasswordBox_KeyDown"/>
+        <Button Grid.ColumnSpan="2" Content="Set Password" Grid.Row="3" Padding="30,3" Margin="5" HorizontalAlignment="Center" Click="SubmitClick"/>
+    </Grid>
+</Window>
diff --git a/ANAConversationStudio/Views/SetPassword.xaml.cs b/ANAConversationStudio/Views/SetPassword.xaml.cs
new file mode 100644
index 0000000..7ded914
--- /dev/null
+++ b/ANAConversationStudio/Views/SetPassword.xaml.cs
@@ -0,0 +1,70 @@
+using ANAConversationStudio.Helpers;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+using Xceed.Wpf.Toolkit.PropertyGrid.Attributes;
+
+namespace ANAConversationStudio.Views
+{
+    /// <summary>
+    /// Interaction logic for SetPassword.xaml
+    /// </summary>
+    public partial class SetPassword : Window
+    {
+        public SetPassword()
+        {
+            InitializeComponent();
+            this.Closing += SetPassword_Closing;
+        }
+
+        private void SetPassword_Closing(object sender, CancelEventArgs e)
+        {
+            if (!Success)
+            {
+                MainWindow.Current.AskAlert = false;
+                App.Current.Shutdown();
+            }
+        }
+
+        public bool Success { get; set; }
+        private void SubmitClick(object sender, RoutedEventArgs e)
+        {
+            Submit();
+        }
+
+        private void Submit()
+        {
+            if (!string.IsNullOrWhiteSpace(NewPasswordBox.Password) && NewPasswordBox.Password == ConfirmPasswordBox.Password)
+            {
+                App.Cryptio = NewPasswordBox.Password;
+                if (Utilities.Settings == null)
+                    Utilities.Settings = new Settings();
+                Utilities.Settings.Save(App.Cryptio);
+                Utilities.Settings = Settings.Load(App.Cryptio);
+                Success = true;
+                this.Close();
+            }
+            else
+            {
+                MessageBox.Show("Password cannot be empty or your new password does not match with confirm password!. Please correct it.", "Oops!");
+            }
+        }
+
+        private void ConfirmPasswordBox_KeyDown(object sender, KeyEventArgs e)
+        {
+            if (e.Key == Key.Enter)
+                Submit();
+        }
+    }
+}
diff --git a/ANAConversationStudio/Views/SettingsWindow.xaml b/ANAConversationStudio/Views/SettingsWindow.xaml
new file mode 100644
index 0000000..b3e4b75
--- /dev/null
+++ b/ANAConversationStudio/Views/SettingsWindow.xaml
@@ -0,0 +1,18 @@
+<Window x:Class="ANAConversationStudio.Views.SettingsWindow"
+        xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+        xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+        xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+        xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+        xmlns:xctk="http://schemas.xceed.com/wpf/xaml/toolkit"
+        xmlns:local="clr-namespace:ANAConversationStudio.Views"
+        mc:Ignorable="d"
+        Title="Settings" Height="500" Width="600">
+    <Grid>
+        <Grid.RowDefinitions>
+            <RowDefinition />
+            <RowDefinition Height="Auto"/>
+        </Grid.RowDefinitions>
+        <xctk:PropertyGrid Margin="10" x:Name="SettingsEditor" SelectedObject="{Binding Config}"/>
+        <Button Content="Save" Click="SaveClick" Grid.Row="1" Margin="10" HorizontalAlignment="Center" Padding="30,5"/>
+    </Grid>
+</Window>
diff --git a/ANAConversationStudio/Views/SettingsWindow.xaml.cs b/ANAConversationStudio/Views/SettingsWindow.xaml.cs
new file mode 100644
index 0000000..f30059c
--- /dev/null
+++ b/ANAConversationStudio/Views/SettingsWindow.xaml.cs
@@ -0,0 +1,43 @@
+using ANAConversationStudio.Helpers;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows;
+using System.Windows.Controls;
+using System.Windows.Data;
+using System.Windows.Documents;
+using System.Windows.Input;
+using System.Windows.Media;
+using System.Windows.Media.Imaging;
+using System.Windows.Shapes;
+
+namespace ANAConversationStudio.Views
+{
+    /// <summary>
+    /// Interaction logic for SettingsWindow.xaml
+    /// </summary>
+    public partial class SettingsWindow : Window
+    {
+        public EditableSettings Config
+        {
+            get { return (EditableSettings)GetValue(ConfigProperty); }
+            set { SetValue(ConfigProperty, value); }
+        }
+        public static readonly DependencyProperty ConfigProperty = DependencyProperty.Register("Config", typeof(EditableSettings), typeof(SettingsWindow), new PropertyMetadata(null));
+
+        public SettingsWindow(EditableSettings config)
+        {
+            InitializeComponent();
+            this.DataContext = this;
+            Config = config.DeepCopy();
+        }
+        public bool Save { get; set; }
+        private void SaveClick(object sender, RoutedEventArgs e)
+        {
+            Save = true;
+            this.Close();
+        }
+    }
+}
diff --git a/ANAConversationSuite.sln b/ANAConversationSuite.sln
index 3313e04..82ef784 100644
--- a/ANAConversationSuite.sln
+++ b/ANAConversationSuite.sln
@@ -1,7 +1,7 @@
 
 Microsoft Visual Studio Solution File, Format Version 12.00
 # Visual Studio 15
-VisualStudioVersion = 15.0.26430.6
+VisualStudioVersion = 15.0.26430.12
 MinimumVisualStudioVersion = 10.0.40219.1
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "ANAConversationStudio", "ANAConversationStudio\ANAConversationStudio.csproj", "{964D06C1-81E3-438D-9DCE-CFA8FB87F04D}"
 EndProject