diff --git a/README.md b/README.md
index c40e6a88385204d6bb275235a5fa2f21fe4c08a5..de928cf4b22142d45bee556d3df178c0ca402846 100644
--- a/README.md
+++ b/README.md
@@ -8,6 +8,12 @@ Visceral is a forensic tool aiming visualize data extracted from [EVTXtract](htt
 
 The development of the application is currently focused on Windows OS.
 
+## Disclaimer
+
+This project is currently in beta, which means it won't be effective in a real forensic case for now. 
+It is currently closer to a PoC (proof of concept), rather than a finished project.
+All constructed criticism is appreciated.
+
 ## Requirements
 
 In order to run the application, you will need to install :
@@ -49,6 +55,10 @@ The import time will depend of the size of the data. Over 1Go of imported data,
 
 Graph visualization enables the investigator to navigate through pre-analyzed graph generated by the previously imported data.
 
+<div align="center">
+	<img src="Visceral/wwwroot/images/visceral_client.gif" alt="demo client visceral" width="600"/>
+</div>
+
 Start with a node as your entry point, then expend the range of your investigation by displaying adjacent nodes.
 
 * A **date range filter** is available to narrow down the graph you will investigate.
@@ -61,4 +71,4 @@ Big thanks to the members of the team who spent 1 month on this end-of-studies p
 
 ## License
 
-This software is available under the [GPLv3 Licence](./LICENSE).
\ No newline at end of file
+This software is available under the [GPLv3 Licence](./LICENSE).
diff --git a/Visceral.sln.DotSettings.user b/Visceral.sln.DotSettings.user
new file mode 100644
index 0000000000000000000000000000000000000000..7dce6a01e06c0fec76a8eae3e6581fdacab0a14d
--- /dev/null
+++ b/Visceral.sln.DotSettings.user
@@ -0,0 +1,3 @@
+<wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=fileprovider/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=ntfs/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>
\ No newline at end of file
diff --git a/Visceral/Controllers/ApiController.cs b/Visceral/Controllers/ApiController.cs
index 267598310d68344b5296cdfa3e0f13a393917be3..1001993dceb45f89b172f95a7c8cc2e19830c909 100644
--- a/Visceral/Controllers/ApiController.cs
+++ b/Visceral/Controllers/ApiController.cs
@@ -10,7 +10,7 @@ namespace Visceral.Controllers
         private readonly object _apiInformations = new
         {
             title = "Visceral API",
-            author = "mailto:visceral_taskforce@protonmail.com"
+            author = "mailto:visceral_team@protonmail.com"
         };
         
         private readonly object _apiUrls = new
diff --git a/Visceral/Controllers/ImportController.cs b/Visceral/Controllers/ImportController.cs
index f4432c6132d289aa9f85d1370296ce52b6e49fce..024847e935b10d48e9aa9058ed88dd202edade25 100644
--- a/Visceral/Controllers/ImportController.cs
+++ b/Visceral/Controllers/ImportController.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
 using System.Threading.Tasks;
@@ -7,9 +6,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Visceral.Models.ConfigFiles;
 using Visceral.Models.View;
-using Visceral.Repository;
 using Visceral.Repository.Import;
-using Visceral.Services;
 using Visceral.Services.Import;
 
 namespace Visceral.Controllers
@@ -20,12 +17,13 @@ namespace Visceral.Controllers
         private readonly PlasoMftEventRepository _plasoMftEventRepository;
         private readonly GraphRepository _graphRepository;
         private readonly IndexRepository _indexRepository;
+        private readonly CustomFunctionRepository _customFunctionRepository;
         private readonly UploadConfig _uploadConfig;
         private readonly JsonSplittingService _jsonSplittingService;
 
         public ImportController(WindowsEventRepository windowsEventRepository, UploadConfig uploadConfig,
             PlasoMftEventRepository plasoMftEventRepository, JsonSplittingService jsonSplittingService, 
-            GraphRepository graphRepository, IndexRepository indexRepository )
+            GraphRepository graphRepository, IndexRepository indexRepository, CustomFunctionRepository customFunctionRepository )
         {
             _windowsEventRepository = windowsEventRepository;
             _plasoMftEventRepository = plasoMftEventRepository;
@@ -33,6 +31,7 @@ namespace Visceral.Controllers
             _uploadConfig = uploadConfig;
             _jsonSplittingService = jsonSplittingService;
             _indexRepository = indexRepository;
+            _customFunctionRepository = customFunctionRepository;
         }
         
         public IActionResult Import()
@@ -56,6 +55,7 @@ namespace Visceral.Controllers
             try
             {
                 await _indexRepository.CreateIndexesIfNotAlreadyExisting();
+                await _customFunctionRepository.CreateAllCustomsFunctionIfNotAlreadyExisting();
                 
                 switch (uploadTypeAction)
                 {
diff --git a/Visceral/Controllers/LabelsController.cs b/Visceral/Controllers/LabelsController.cs
index d34e464df1cf6544dc2259e8a83a54acf96c8e4e..5bee75111783a3988e2169d6a90a13e67e4dfebc 100644
--- a/Visceral/Controllers/LabelsController.cs
+++ b/Visceral/Controllers/LabelsController.cs
@@ -56,7 +56,7 @@ namespace Visceral.Controllers
             }
             else
             {
-                queryResult = await _repository.GetNeighboursLabel(label);
+                queryResult = await _repository.GetOuterNeighboursLabel(label);
             } 
             return _service.ResultToApiFormat(queryResult);
         }
diff --git a/Visceral/Controllers/NodesController.cs b/Visceral/Controllers/NodesController.cs
index e954ef681ffa0767dc401d70e99a31815f90c19a..6d0e7fbe57dc34c5a704113ca5cac4046db7e224 100644
--- a/Visceral/Controllers/NodesController.cs
+++ b/Visceral/Controllers/NodesController.cs
@@ -6,9 +6,7 @@ using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Neo4j.Driver;
 using Visceral.Models.ErrorsApi;
-using Visceral.Repository;
 using Visceral.Repository.API;
-using Visceral.Services;
 using Visceral.Services.API;
 
 namespace Visceral.Controllers
@@ -44,8 +42,6 @@ namespace Visceral.Controllers
         /// <param name="label">Filters the node by label. Only take one label.</param>
         /// <param name="limit">Maximum number of nodes returned.</param>
         /// <param name="skip">Number of nodes to skip before returning the rest.</param>
-        /// <param name="startDate">Filter. Keep every element after this date</param>
-        /// <param name="endDate">Filter. Keep every element before this date</param>
         /// <returns>A list of all nodes queried in Vis Node Format.</returns>
         /// <response code="200">Returns a list of all nodes queried in Vis Node Format.</response>
         /// <response code="422">If one or more parameters doesn't complete validation. Returns errors.</response>
@@ -53,11 +49,11 @@ namespace Visceral.Controllers
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
         public async Task<IDictionary<string, object>> GetNodes([FromQuery] string? label=null,[FromQuery] int limit=0,
-            [FromQuery] int skip=0, [FromQuery] string? startDate=null, [FromQuery] string? endDate=null)
+            [FromQuery] int skip=0)
         {
             try
             {
-                List<INode> neo4JNodeList = await _nodeRepository.GetNodes(label,skip,limit,startDate,endDate);
+                List<INode> neo4JNodeList = await _nodeRepository.GetNodes(label,skip,limit);
                 List<IDictionary<string, object>> visNodeList = neo4JNodeList.AsParallel()
                     .Select(node => _nodeService.NodeToVisNode(node))
                     .ToList();
@@ -76,8 +72,6 @@ namespace Visceral.Controllers
         /// Gets a node by id.
         /// </summary>
         /// <param name="id">Id of the queried node.</param>
-        /// <param name="startDate">Filter. Keep every element after this date</param>
-        /// <param name="endDate">Filter. Keep every element before this date</param>
         /// <returns>The node with the given id in Vis Node Format.</returns>
         /// <response code="200">Returns the node found with the given id in Vis Node Format.</response>
         /// <response code="400">If there is no node with this id.</response>
@@ -86,12 +80,11 @@ namespace Visceral.Controllers
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
-        public async Task<IDictionary<string, object>> GetNodeById(int id,[FromQuery] string? startDate=null,
-            [FromQuery] string? endDate=null)
+        public async Task<IDictionary<string, object>> GetNodeById(int id)
         {
             try
             {
-                INode neo4JNode = await _nodeRepository.GetNodeById(id,startDate,endDate);
+                INode neo4JNode = await _nodeRepository.GetNodeById(id);
                 IDictionary<string, object> visNode = _nodeService.NodeToVisNode(neo4JNode);
                 return _apiService.ResultToApiFormat(visNode);
             }
@@ -122,7 +115,7 @@ namespace Visceral.Controllers
         [ProducesResponseType(StatusCodes.Status422UnprocessableEntity)]
         public async Task<IDictionary<string, object>> GetNeighborsNodesByLabel(int id,[FromQuery] string? label=null, 
             [FromQuery] string? type=null, [FromQuery] int limit=0,[FromQuery] int skip=0, 
-            [FromQuery] string? startDate=null, [FromQuery] string? endDate=null )
+            [FromQuery] long? startDate=null, [FromQuery] long? endDate=null )
         {
             try
             {
@@ -150,5 +143,19 @@ namespace Visceral.Controllers
                 return _apiService.ErrorToApiFormat(error.ToDictionary());
             }
         }
+
+        //GET /api/node/{id}/neighbour/labels
+        /// <summary>
+        /// From the node id, gets neighbours labels without caring of the orientation of the relationship.
+        /// </summary>
+        /// <param name="id">id of the starting node.</param>
+        /// <returns>A list of labels from the neighbour nodes</returns>
+        [Route("{id}/neighbour/labels"), HttpGet]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        public async Task<object> GetNeighboursLabelById(int id)
+        {
+            var labels = await _nodeNeighborsRepository.FromIdGetNodeNeighboursLabel(id);
+            return _apiService.ResultToApiFormat(labels);
+        }
     }
 }
\ No newline at end of file
diff --git a/Visceral/Models/DatabaseNodes/Computer.cs b/Visceral/Models/DatabaseNodes/Computer.cs
new file mode 100644
index 0000000000000000000000000000000000000000..f9ac1e529a166e22269a90e415d36d2dcc24d38b
--- /dev/null
+++ b/Visceral/Models/DatabaseNodes/Computer.cs
@@ -0,0 +1,7 @@
+namespace Visceral.Models.DatabaseNodes
+{
+    public class Computer
+    {
+        public string? Name;
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Models/DatabaseNodes/Group.cs b/Visceral/Models/DatabaseNodes/Group.cs
new file mode 100644
index 0000000000000000000000000000000000000000..fe8c5fdf46b9cdf02167aceb5969e9cf28a300c7
--- /dev/null
+++ b/Visceral/Models/DatabaseNodes/Group.cs
@@ -0,0 +1,8 @@
+namespace Visceral.Models.DatabaseNodes
+{
+    public class Group
+    {
+        public string? Sid;
+        public string? Name;
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Models/DatabaseNodes/Handle.cs b/Visceral/Models/DatabaseNodes/Handle.cs
new file mode 100644
index 0000000000000000000000000000000000000000..b64c750790386537c7d56b3bc9a8c24c88ec5c78
--- /dev/null
+++ b/Visceral/Models/DatabaseNodes/Handle.cs
@@ -0,0 +1,7 @@
+namespace Visceral.Models.DatabaseNodes
+{
+    public class Handle
+    {
+        public string? Id;
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Models/DatabaseNodes/Object.cs b/Visceral/Models/DatabaseNodes/Object.cs
new file mode 100644
index 0000000000000000000000000000000000000000..91aae9cf19571846415931650f5d3d9790876763
--- /dev/null
+++ b/Visceral/Models/DatabaseNodes/Object.cs
@@ -0,0 +1,11 @@
+namespace Visceral.Models.DatabaseNodes
+{
+    public class Object
+    {
+        public string? Sd;
+        public string? Type;
+        public string? NameGuid;
+        public string? Name;
+        public string? TypeGuid;
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Models/DatabaseNodes/PlasoMftEvent.cs b/Visceral/Models/DatabaseNodes/PlasoMftEvent.cs
new file mode 100644
index 0000000000000000000000000000000000000000..da8fc7b5663fd51a05295f87606e897934827f32
--- /dev/null
+++ b/Visceral/Models/DatabaseNodes/PlasoMftEvent.cs
@@ -0,0 +1,7 @@
+namespace Visceral.Models.DatabaseNodes
+{
+    public class PlasoMftEvent
+    {
+        //Parameter generated automatically
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Models/DatabaseNodes/Process.cs b/Visceral/Models/DatabaseNodes/Process.cs
new file mode 100644
index 0000000000000000000000000000000000000000..7ac5d6645fd3bcb8eb93c38dd06f09320094e6ac
--- /dev/null
+++ b/Visceral/Models/DatabaseNodes/Process.cs
@@ -0,0 +1,12 @@
+using System;
+
+namespace Visceral.Models.DatabaseNodes
+{
+    public class Process
+    {
+        public DateTime? TimeCreated;
+        public string? LogonType;
+        public string? EventID;
+        public string? DomainName;
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Models/DatabaseNodes/Session.cs b/Visceral/Models/DatabaseNodes/Session.cs
new file mode 100644
index 0000000000000000000000000000000000000000..3f2bbe4f44f47751c19d9d94ed1394a6dab934e6
--- /dev/null
+++ b/Visceral/Models/DatabaseNodes/Session.cs
@@ -0,0 +1,7 @@
+namespace Visceral.Models.DatabaseNodes
+{
+    public class Session
+    {
+        public string? LogonId;
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Models/DatabaseNodes/User.cs b/Visceral/Models/DatabaseNodes/User.cs
new file mode 100644
index 0000000000000000000000000000000000000000..30716a3f6840176681c361896d905a9053fbaf31
--- /dev/null
+++ b/Visceral/Models/DatabaseNodes/User.cs
@@ -0,0 +1,9 @@
+namespace Visceral.Models.DatabaseNodes
+{
+    public class User
+    {
+        public string? Username;
+        public string? DomainName;
+        public string? Sid;
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Models/DatabaseNodes/WindowsEvent.cs b/Visceral/Models/DatabaseNodes/WindowsEvent.cs
new file mode 100644
index 0000000000000000000000000000000000000000..faba6b293dfc2509b07516cc052f083d6e2117aa
--- /dev/null
+++ b/Visceral/Models/DatabaseNodes/WindowsEvent.cs
@@ -0,0 +1,7 @@
+namespace Visceral.Models.DatabaseNodes
+{
+    public class WindowsEvent
+    {
+        //Parameter generated automatically
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Repository/API/LabelRepository.cs b/Visceral/Repository/API/LabelRepository.cs
index d18cd90ec4969564265f4a44d7377a94ffc0709f..439f2c4f5f9ab695532429bafc45343c0ef5ecf0 100644
--- a/Visceral/Repository/API/LabelRepository.cs
+++ b/Visceral/Repository/API/LabelRepository.cs
@@ -32,7 +32,10 @@ namespace Visceral.Repository.API
             }
         }
 
-        public async Task<object> GetNeighboursLabel(string startingLabel)
+        /**
+         * Gets all the labels available in outer neighbour nodes from nodes of a specific label
+         */
+        public async Task<object> GetOuterNeighboursLabel(string startingLabel)
         {
             IAsyncSession session = _driver.AsyncSession(o => o.WithDatabase("neo4j"));
             try
@@ -63,7 +66,7 @@ namespace Visceral.Repository.API
 
             foreach(var label in labels)
             {
-                List<string> navigationList = (List<string>) await GetNeighboursLabel(label);
+                List<string> navigationList = (List<string>) await GetOuterNeighboursLabel(label);
                 navigationDictionary.Add(label, navigationList);
             }
 
diff --git a/Visceral/Repository/API/NodeExtendRepository.cs b/Visceral/Repository/API/NodeExtendRepository.cs
index 7ad980b80ed14df2957a09052ae50a5ff5ce143f..6df8138218718879aff180f172f96c8bc31ef258 100644
--- a/Visceral/Repository/API/NodeExtendRepository.cs
+++ b/Visceral/Repository/API/NodeExtendRepository.cs
@@ -1,23 +1,24 @@
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.Linq;
 using System.Threading.Tasks;
 using Neo4j.Driver;
 using Visceral.Models.ErrorsApi;
-using Visceral.Services;
+using Visceral.Services.API;
 using Visceral.Utils;
 
 namespace Visceral.Repository.API
 {
     public class NodeNeighborsRepository
     {
-        private readonly Neo4JDateService _neo4JDateService;
         private readonly IDriver _driver;
+        private readonly DateService _dateService;
         
-        public NodeNeighborsRepository(IDriver driver, Neo4JDateService neo4JDateService)
+        public NodeNeighborsRepository(IDriver driver,DateService dateService)
         {
             _driver = driver;
-            _neo4JDateService = neo4JDateService;
+            _dateService = dateService;
         }
 
         /**
@@ -25,7 +26,7 @@ namespace Visceral.Repository.API
          * https://neo4j.com/docs/labs/apoc/current/graph-querying/expand-paths/
          */
         public async Task<List<IPath>> FromNodeByIdExtend(int nodeId,string? neighborsLabel,string? relationshipType,
-            int limit, int skip, string? startDate,string? endDate)
+            int limit, int skip, long? startDate,long? endDate)
         {
             if (nodeId < 0)
             {
@@ -46,23 +47,33 @@ namespace Visceral.Repository.API
                     .SetErrorSource("/api/nodes/id/extend/{?type}");
             }
 
-            startDate = _neo4JDateService.FromStringOptional(startDate);
-            endDate = _neo4JDateService.FromStringOptional(endDate);
-
             IAsyncSession session = _driver.AsyncSession(o => o.WithDatabase("neo4j"));
             try
             {
+                var neo4JStringStartDate = DateService.MicrosecondTimestampToNeo4JDatetimeString(startDate);
+                var neo4JStringEndDate = DateService.MicrosecondTimestampToNeo4JDatetimeString(endDate);
+                
                 IResultCursor cursor = await new CypherQueryBuilder(session)
-                    .Match("paths=(sn)-[rl]->(en)")
+                    .Match("paths=(sn)-[rl]-(en)")
                     .WhereDynamicParam("ID(sn) = $NodeId", nodeId, CypherQueryBuilder.WhereOperators.And)
                     .WhereDynamicParamOptional("$NeighboursLabel IN labels(en)", neighborsLabel,
                         CypherQueryBuilder.WhereOperators.And)
                     .WhereDynamicParamOptional("type(rl) = $RelationshipType", relationshipType,
                         CypherQueryBuilder.WhereOperators.And)
-                    .WhereDynamicParamOptional("$startDate <= apoc.date.parse(rl.Timestamp,'ms',('yyyy-MM-dd HH:mm:ss.SSS'))", startDate,
+                    .WhereStaticOptional(
+                        $"{neo4JStringStartDate} <= rl.TimeCreated",
+                        neo4JStringStartDate != null,
                         CypherQueryBuilder.WhereOperators.And)
-                    .WhereDynamicParamOptional("apoc.date.parse(rl.Timestamp,'ms',('yyyy-MM-dd HH:mm:ss.SSS')) <= $endDate", endDate, 
+                    .WhereStaticOptional(
+                        $"rl.TimeCreated <= {neo4JStringEndDate}",
+                        neo4JStringEndDate != null,
                         CypherQueryBuilder.WhereOperators.And)
+                    //.WhereDynamicParamOptional("$startDate <= rl.TimeCreated", 
+                    //    DateService.MicrosecondTimestampToNeo4JDatetimeString(startDate),
+                    //    CypherQueryBuilder.WhereOperators.And)
+                    //.WhereDynamicParamOptional("rl.TimeCreated <= $endDate", 
+                    //    DateService.MicrosecondTimestampToNeo4JDatetimeString(endDate), 
+                    //    CypherQueryBuilder.WhereOperators.And)
                     .Unwind("paths AS Path")
                     .Return("Path")
                     .Skip(skip)
@@ -70,7 +81,10 @@ namespace Visceral.Repository.API
                     .Exec();
                 
                 List<IPath> paths = await cursor.ToListAsync(record => record["Path"].As<IPath>());
-                await cursor.ConsumeAsync();
+
+                //Debugging in order to understand why {} are messing with RunAsync(string,dictionnary<string,object>)
+                //var resultSummary = await cursor.ConsumeAsync();
+                //Console.WriteLine(resultSummary.Query);
                 return paths;
 
             }
@@ -84,5 +98,33 @@ namespace Visceral.Repository.API
                 await session.CloseAsync();
             }
         }
+        
+        /**
+         * Gets neighbours labels of a selected node by id without caring of the orientation of the relationship.
+         */
+        public async Task<List<string>> FromIdGetNodeNeighboursLabel(int nodeId)
+        {
+            IAsyncSession session = _driver.AsyncSession(o => o.WithDatabase("neo4j"));
+        
+            try
+            {
+                IResultCursor cursor = await new CypherQueryBuilder(session)
+                    .Match("(starting_node)--(end_node)")
+                    .WhereDynamicParam("ID(starting_node) = $NodeId", nodeId,
+                        CypherQueryBuilder.WhereOperators.And)
+                    .Unwind("labels(end_node) AS EndLabel")
+                    .With("DISTINCT EndLabel")
+                    .Return("EndLabel")
+                    .Exec();
+        
+                List<string> labels = await cursor.ToListAsync(record => record["EndLabel"].As<string>());
+                await cursor.ConsumeAsync();
+                return labels;
+            }
+            finally
+            {
+                await session.CloseAsync();
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/Visceral/Repository/API/NodeRepository.cs b/Visceral/Repository/API/NodeRepository.cs
index 32bc215fd3e656d4ec2f567f752a76b1e636b070..64709727d9fa6d8ce3711a439374f86e5442f7c7 100644
--- a/Visceral/Repository/API/NodeRepository.cs
+++ b/Visceral/Repository/API/NodeRepository.cs
@@ -17,7 +17,7 @@ namespace Visceral.Repository.API
             _driver = driver;
         }
 
-        public async Task<INode> GetNodeById(int nodeId, string? startDate, string? endDate)
+        public async Task<INode> GetNodeById(int nodeId)
         {
             if (nodeId < 0) //Checking if nodeId isn't negative 
             {
@@ -48,7 +48,7 @@ namespace Visceral.Repository.API
             }
         }
 
-        public async Task<List<INode>> GetNodes(string? label, int skip, int limit, string? startDate,string? endDate)
+        public async Task<List<INode>> GetNodes(string? label, int skip, int limit)
         {
             if (label != null && !label.All(char.IsLetter))
             {
@@ -57,15 +57,6 @@ namespace Visceral.Repository.API
                     .SetErrorSource("/api/nodes/label/{label}");
             }
 
-            if (startDate != null)
-            {
-                Console.WriteLine(startDate);
-            }
-            if (endDate != null)
-            {
-                Console.WriteLine(endDate);
-            }
-            
             IAsyncSession session = _driver.AsyncSession(o => o.WithDatabase("neo4j"));
             try
             {
diff --git a/Visceral/Repository/Import/CustomFunctionRepository.cs b/Visceral/Repository/Import/CustomFunctionRepository.cs
new file mode 100644
index 0000000000000000000000000000000000000000..364dde9e055a271bed1fbb9f596deb1b2d0f6c87
--- /dev/null
+++ b/Visceral/Repository/Import/CustomFunctionRepository.cs
@@ -0,0 +1,94 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Neo4j.Driver;
+
+namespace Visceral.Repository.Import
+{
+    public class CustomFunctionRepository
+    {
+        private readonly IDriver _driver;
+
+        public CustomFunctionRepository(IDriver driver)
+        {
+            _driver = driver;
+        }
+
+        /**
+         * Creates all the custom functions useful for the database requests
+         */
+        public async Task CreateAllCustomsFunctionIfNotAlreadyExisting()
+        {
+            await CreateCustomFunctionIfNotAlreadyExisting("date_EvtxToNeo4J",
+                "WITH split($evtx_date,' ') AS date_split " +
+                "WITH split(date_split[0],'-') AS d, split(date_split[1],'.') AS t " +
+                "WITH toInteger(d[0]) as y, toInteger(d[1]) as m, toInteger(d[2]) as d, split(t[0],':') as time, toInteger(t[1]) as mics " +
+                "WITH y,m,d,toInteger(time[0]) as h, toInteger(time[1]) as mn, toInteger(time[2]) as s, mics " +
+                "RETURN datetime({year:y,month:m,day:d,hour:h,minute:mn,second:s,microsecond:mics})",
+                "DATETIME",
+                new List<(string, string)>{("evtx_date","STRING")},
+                "Transforms a date in string format from an Evtx to a Datetime object in Neo4J");
+        }
+
+        /**
+         * Creates a custom function with apoc in the database if it doesn't already exist
+         */
+        private async Task CreateCustomFunctionIfNotAlreadyExisting(string functionName, string functionQuery, string returnType,
+            List<(string, string)> functionParameters, string functionDescription)
+        {
+            if (functionName == null) throw new ArgumentNullException(nameof(functionName));
+            if (functionQuery == null) throw new ArgumentNullException(nameof(functionQuery));
+            if (returnType == null) throw new ArgumentNullException(nameof(returnType));
+            if (functionParameters == null) throw new ArgumentNullException(nameof(functionParameters));
+            if (functionDescription == null) throw new ArgumentNullException(nameof(functionDescription));
+            if (functionParameters.Count == 0)
+                throw new ArgumentException("Value cannot be an empty collection.", nameof(functionParameters));
+
+            if (await FunctionAlreadyExists(functionName))
+            {
+                Console.WriteLine("exists");
+                return;
+            }
+            
+            IAsyncSession session = _driver.AsyncSession(o => o.WithDatabase("neo4j"));
+            try
+            {
+                var query = $"CALL apoc.custom.asFunction(\"{functionName}\",\"{functionQuery}\",\"{returnType}\",[";
+                foreach (var (paramName, paramValue) in functionParameters)
+                {
+                    query += $"[\"{paramName}\",\"{paramValue}\"],";
+                }
+                query = query.Remove(query.Length - 1) + $"],false,\"{functionDescription}\")"; //Removing the last coma and adding closing bracket/parenthese
+
+                IResultCursor cursor = await session.RunAsync(query);
+                await cursor.ConsumeAsync();
+            }
+            finally
+            {
+                await session.CloseAsync();
+            }
+        }
+
+        /**
+         * Checks if the custom function already exists in the database
+         */
+        private async Task<bool> FunctionAlreadyExists(string functionName)
+        {
+            IAsyncSession session = _driver.AsyncSession(o => o.WithDatabase("neo4j"));
+            try
+            {
+                const string query = "CALL apoc.custom.list";
+                IResultCursor cursor = await session.RunAsync(query);
+                List<string> customs = await cursor.ToListAsync(record => record["name"].As<string>());
+                await cursor.ConsumeAsync();
+                
+                //No type verification ! Process could have same name as the function !
+                return customs.Contains(functionName);
+            }
+            finally
+            {
+                await session.CloseAsync();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Repository/Import/IndexRepository.cs b/Visceral/Repository/Import/IndexRepository.cs
index 124e92b583c654e20ed969415ec58b3516e86879..3c76db16440c829cba3642913dcb6ca43b83af5b 100644
--- a/Visceral/Repository/Import/IndexRepository.cs
+++ b/Visceral/Repository/Import/IndexRepository.cs
@@ -47,7 +47,7 @@ namespace Visceral.Repository.Import
             try
             {
                 // If index already exist, end the function
-                if (await IsIndexAlreadyExisting(indexName)) return;
+                if (await IndexAlreadyExists(indexName)) return;
                 
                 // Create the index
                 var creationQuery = $"CREATE INDEX {indexName} FOR (n:{nodeLabel}) ON (";
@@ -79,7 +79,7 @@ namespace Visceral.Repository.Import
             try
             {
                 // If index already exist, end the function
-                if (await IsIndexAlreadyExisting(indexName)) return;
+                if (await IndexAlreadyExists(indexName)) return;
                 
                 // Create the composite index
                 var creationQuery = $"CREATE INDEX {indexName} FOR (n:{nodeLabel}) ON (";
@@ -104,12 +104,12 @@ namespace Visceral.Repository.Import
         /**
          * Checks if the index exist in the Neo4J database, based on its name.
          */
-        private async Task<bool> IsIndexAlreadyExisting(string indexName)
+        private async Task<bool> IndexAlreadyExists(string indexName)
         {
             IAsyncSession session = _driver.AsyncSession(o => o.WithDatabase("neo4j"));
             
             // Getting the list of created indexes in Neo4J
-            var query = "CALL db.indexes";
+            const string query = "CALL db.indexes";
             IResultCursor cursor = await session.RunAsync(query);
             List<string> existingIndexes = await cursor.ToListAsync(record => record["name"].As<string>());
             await cursor.ConsumeAsync();
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4616Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4616Repository.cs
index 5cd607180823faf1dccb9a565396e8b8bc5c431b..fd7e8583fc1901bfb368a9319e44991ec040ae28 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4616Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4616Repository.cs
@@ -34,11 +34,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                 "subjectUser.Sid = n.SubjectUserSid, "+
                 "subjectUser.Username = n.SubjectUserName, "+
                 "subjectUser.DomainName = n.SubjectDomainName "+
-                "WITH n,subjectUser,process,split(n.TimeCreated, \".\") as date "+
+                "WITH n,subjectUser,process,n.TimeCreated as date "+
                 "CREATE (process)-[processAs:AS]->(subjectUser) "+
                 "SET "+
-                "processAs.TimeCreated = apoc.date.parse( date[0] + \".\" + " +
-                "toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+                "processAs.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                 "processAs.LogonType = n.LogonType, "+
                 "processAs.EventID = n.EventID "+
                 "RETURN processAs"; 
@@ -61,10 +60,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                "MERGE (subjectSession:Session { LogonId : n.SubjectLogonId}) "+
                "ON CREATE SET "+
                "subjectSession.LogonId = n.SubjectLogonId "+
-               "WITH n,subjectUser,subjectSession,split(n.TimeCreated, \".\") as date "+
+               "WITH n,subjectUser,subjectSession,n.TimeCreated as date "+
                "CREATE (subjectUser)-[usingSession:USING]->(subjectSession) "+
                "SET "+
-               "usingSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+               "usingSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                "usingSession.LogonType = n.LogonType, "+
                "usingSession.EventID = n.EventID "+
                "RETURN usingSession";
@@ -85,12 +84,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
               "ON CREATE SET  "+
               "subjectSession.LogonId = n.SubjectLogonId "+
-              "WITH n,computer,subjectSession,split(n.TimeCreated, \".\") as date "+
-              "CREATE (subjectSession)-[changeTime:CHANGE_TIME {TimeCreated : apoc.date.parse( date[0] + \".\" + " +
-              "toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(computer) "+
+              "WITH n,computer,subjectSession,n.TimeCreated as date "+
+              "CREATE (subjectSession)-[changeTime:CHANGE_TIME {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(computer) "+
               "SET "+
-              "changeTime.TimeCreated = apoc.date.parse( date[0] + \".\" + " +
-              "toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "changeTime.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "changeTime.EventID = n.EventID, "+
               "changeTime.NewTime = n.NewTime, "+
               "changeTime.PreviousTime = n.PreviousTime "+
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4624Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4624Repository.cs
index 14de890757dba33551d870415513935c85b66fa6..4835e10276c34c0388f8ca4d99d69da284aa02e5 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4624Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4624Repository.cs
@@ -35,10 +35,10 @@ namespace Visceral.Repository.Import.WindowsEvents
              "subjectUser.Sid = n.SubjectUserSid, "+
              "subjectUser.Username = n.SubjectUserName, "+
              "subjectUser.DomainName = n.SubjectDomainName "+
-             "WITH n,subjectUser,process,split(n.TimeCreated, \".\") as date "+
+             "WITH n,subjectUser,process,n.TimeCreated as date "+
              "CREATE (process)-[processAs:AS]->(subjectUser) "+
              "SET "+
-             "processAs.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+             "processAs.TimeCreated = custom.date_EvtxToNeo4J(date), "+
              "processAs.LogonType = n.LogonType, "+
              "processAs.EventID = n.EventID "+
              "RETURN processAs";
@@ -60,10 +60,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (subjectSession:Session { LogonId : n.SubjectLogonId}) "+
               "ON CREATE SET "+
               "subjectSession.LogonId = n.SubjectLogonId "+
-              "WITH n,subjectUser,subjectSession,split(n.TimeCreated, \".\") as date "+
+              "WITH n,subjectUser,subjectSession,n.TimeCreated as date "+
               "CREATE (subjectUser)-[usingSession:USING]->(subjectSession)  "+
               "SET "+
-              "usingSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "usingSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "usingSession.LogonType = n.LogonType, "+
               "usingSession.EventID = n.EventID "+
               "RETURN usingSession";
@@ -83,10 +83,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (computer:Computer { Name : n.Computer}) "+
               "ON CREATE SET "+
               "computer.Name = n.Computer "+
-              "WITH n,computer,subjectSession,split(n.TimeCreated, \".\") as date "+
+              "WITH n,computer,subjectSession,n.TimeCreated as date "+
               "CREATE (subjectSession)-[logonComputer:CONNECT]->(computer) "+
               "SET "+
-              "logonComputer.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "logonComputer.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "logonComputer.LogonType = n.LogonType, "+
               "logonComputer.EventID = n.EventID, "+
               "logonComputer.IpAddress = n.IpAddress, "+
@@ -110,10 +110,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                "targetUser.Sid = n.TargetUserSid, "+
                "targetUser.Username = n.TargetUserName, "+
                "targetUser.DomainName = n.TargetDomainName "+
-               "WITH n,computer,targetUser,split(n.TimeCreated, \".\") as date "+
+               "WITH n,computer,targetUser,n.TimeCreated as date "+
                "CREATE (computer)-[logonAs:LOG_ON_AS]->(targetUser) "+
                "SET "+
-               "logonAs.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+               "logonAs.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                "logonAs.LogonType = n.LogonType, "+
                "logonAs.EventID = n.EventID "+
                "RETURN logonAs";
@@ -135,10 +135,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                "targetUser.Sid = n.TargetUserSid, "+
                "targetUser.Username = n.TargetUserName, "+
                "targetUser.DomainName = n.TargetDomainName "+
-               "WITH n,targetSession,targetUser,split(n.TimeCreated, \".\") as date "+
+               "WITH n,targetSession,targetUser,n.TimeCreated as date "+
                "CREATE (targetUser)-[logonSession:LOG_ON]->(targetSession) "+
                "SET "+
-               "logonSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+               "logonSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                "logonSession.LogonType = n.LogonType, "+
                "logonSession.EventID = n.EventID "+
                "RETURN logonSession";
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4634Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4634Repository.cs
index 5fdcd8b7e2ce176114bb2d0191573effa9d96526..1ef1ede271650b05aa02494d6d2701fb30efc861 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4634Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4634Repository.cs
@@ -31,10 +31,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                "targetUser.Sid = n.TargetUserSid, "+
                "targetUser.Username = n.TargetUserName, "+
                "targetUser.DomainName = n.TargetDomainName "+
-               "WITH n,computer,targetUser,split(n.TimeCreated, \".\") as date "+
+               "WITH n,computer,targetUser,n.TimeCreated as date "+
                "CREATE (computer)<-[logoffAs:LOG_OFF_AS]-(targetUser) "+
                "SET "+
-               "logoffAs.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+               "logoffAs.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                "logoffAs.LogonType = n.LogonType, "+
                "logoffAs.EventID = n.EventID "+
                "RETURN logoffAs";
@@ -56,10 +56,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                "targetUser.Sid = n.TargetUserSid, " +
                "targetUser.Username = n.TargetUserName, " +
                "targetUser.DomainName = n.TargetDomainName "+
-               "WITH n,targetSession,targetUser,split(n.TimeCreated, \".\") as date " +
+               "WITH n,targetSession,targetUser,n.TimeCreated as date " +
                "CREATE (targetUser)<-[logoffSession:LOG_OFF]-(targetSession) " +
                "SET " +
-               "logoffSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), " +
+               "logoffSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                "logoffSession.LogonType = n.LogonType, " +
                "logoffSession.EventID = n.EventID " +
                "RETURN logoffSession";
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4648Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4648Repository.cs
index 689ea012ca1284e391218cd8cf43451de0fd50fc..1c42fcefd419440372af859dfe2d9a30e0f41454 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4648Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4648Repository.cs
@@ -34,10 +34,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                 "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
                 "ON CREATE SET  "+
                 "subjectSession.Computer = n.SubjectLogonId "+
-                "WITH n,p,subjectSession,split(n.TimeCreated, \".\") as date "+
-                "CREATE (p)-[usingSession:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(subjectSession) "+
+                "WITH n,p,subjectSession,n.TimeCreated as date "+
+                "CREATE (p)-[usingSession:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(subjectSession) "+
                 "SET "+
-                "usingSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+                "usingSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                 "usingSession.DomainName = n.SubjectDomainName, "+ 
                 "usingSession.EventID = n.EventID "+
                 "RETURN usingSession";
@@ -58,10 +58,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                 "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
                 "ON CREATE SET  "+
                 "subjectSession.LogonId = n.SubjectLogonId "+
-                "WITH n,targetUser,subjectSession,split(n.TimeCreated, \".\") as date "+
-                "CREATE (subjectSession)-[logAs:LOG_AS {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(targetUser) "+
+                "WITH n,targetUser,subjectSession,n.TimeCreated as date "+
+                "CREATE (subjectSession)-[logAs:LOG_AS {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(targetUser) "+
                 "SET "+
-                "logAs.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+                "logAs.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                 "logAs.EventID = n.EventID "+
                 "RETURN logAs";
             
@@ -81,10 +81,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                 "MERGE (targetServer:Computer {Name : n.TargetServerName}) "+
                 "ON CREATE SET  "+
                 "targetServer.Name = n.TargetServerName "+
-                "WITH n,targetUser,targetServer,split(n.TimeCreated, \".\") as date "+
-                "CREATE (targetUser)-[logOn:LOG_ON {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(targetServer) "+
+                "WITH n,targetUser,targetServer,n.TimeCreated as date "+
+                "CREATE (targetUser)-[logOn:LOG_ON {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(targetServer) "+
                 "SET "+
-                "logOn.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+                "logOn.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                 "logOn.Domain = n.TargetDomainName, "+
                 "logOn.IpAddress = n.IpAddress, "+
                 "logOn.IpPort = n.IpPort, "+
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4661Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4661Repository.cs
index 67dbbfd09933aaaf9e0f4feddfefdd1aff8c8ba2..83e4224d3aff61677f091d73887ee18cc99f7e4a 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4661Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4661Repository.cs
@@ -34,10 +34,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "ON CREATE SET  "+
               "process.Id = n.ProcessId, "+
               "process.Name = n.ProcessName "+
-              "WITH n,subjectUser,process,split(n.TimeCreated, \".\") as date "+
-              "CREATE (process)-[processAs:AS {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(targetServer) "+
+              "WITH n,subjectUser,process,n.TimeCreated as date "+
+              "CREATE (process)-[processAs:AS {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(targetServer) "+
               "SET "+
-              "processAs.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "processAs.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "processAs.EventID = n.EventID "+
               "RETURN processAs";
  
@@ -58,10 +58,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
               "ON CREATE SET  "+
               "subjectSession.LogonId = n.SubjectLogonId "+
-              "WITH n,subjectSession,subjectUser,split(n.TimeCreated, \".\") as date "+
-              "CREATE (subjectUser)-[usingSession:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(subjectSession) "+
+              "WITH n,subjectSession,subjectUser,n.TimeCreated as date "+
+              "CREATE (subjectUser)-[usingSession:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(subjectSession) "+
               "SET "+
-              "usingSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "usingSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "usingSession.EventID = n.EventID "+
               "RETURN usingSession";
  
@@ -80,10 +80,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (handle:Handle {Id : n.HandleId}) "+
               "ON CREATE SET  "+
               "handle.Id = n.HandleId "+
-              "WITH n,subjectSession,handle,split(n.TimeCreated, \".\") as date "+
-              "CREATE (subjectSession)-[usingHandle:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(handle) "+
+              "WITH n,subjectSession,handle,n.TimeCreated as date "+
+              "CREATE (subjectSession)-[usingHandle:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(handle) "+
               "SET "+
-              "usingHandle.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "usingHandle.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "usingHandle.EventID = n.EventID "+
               "RETURN usingHandle";
  
@@ -103,10 +103,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "ON CREATE SET  "+
               "object.Name = n.ObjectName, "+
               "object.Type = n.ObjectType "+
-              "WITH n,object,handle,split(n.TimeCreated, \".\") as date "+
-              "CREATE (handle)-[requestObjectHandle:REQUEST {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(object) "+
+              "WITH n,object,handle,n.TimeCreated as date "+
+              "CREATE (handle)-[requestObjectHandle:REQUEST {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(object) "+
               "SET "+
-              "requestObjectHandle.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "requestObjectHandle.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "requestObjectHandle.EventID = n.EventID, "+
               "requestObjectHandle.Properties = n.Properties, "+
               "requestObjectHandle.AccessMask = n.AccessMask, "+
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4662Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4662Repository.cs
index b6df52a7d4dc2918727732677c87189fdfb0eac9..8824d1f143b3e630d2a180cfa9308ade1b55d8e4 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4662Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4662Repository.cs
@@ -32,10 +32,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
               "ON CREATE SET  "+
               "subjectSession.LogonId = n.SubjectLogonId "+
-              "WITH n,subjectSession,subjectUser,split(n.TimeCreated, \".\") as date "+
-              "CREATE (subjectUser)-[usingSession:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(subjectSession) "+
+              "WITH n,subjectSession,subjectUser,n.TimeCreated as date "+
+              "CREATE (subjectUser)-[usingSession:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(subjectSession) "+
               "SET "+
-              "usingSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "usingSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "usingSession.EventID = n.EventID "+
               "RETURN usingSession";
  
@@ -54,10 +54,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (handle:Handle {Id : n.HandleId}) "+
               "ON CREATE SET  "+
               "handle.Id = n.HandleId "+
-              "WITH n,subjectSession,handle,split(n.TimeCreated, \".\") as date "+
-              "CREATE (subjectSession)-[usingHandle:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(handle) "+
+              "WITH n,subjectSession,handle,n.TimeCreated as date "+
+              "CREATE (subjectSession)-[usingHandle:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(handle) "+
               "SET "+
-              "usingHandle.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "usingHandle.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "usingHandle.EventID = n.EventID "+
               "RETURN usingHandle";
  
@@ -77,10 +77,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "ON CREATE SET  "+
               "objectAccessed.NameGuid = n.ObjectName, "+
               "objectAccessed.TypeGuid = n.ObjectType "+
-              "WITH n,objectAccessed,handle,split(n.TimeCreated, \".\") as date "+
-              "CREATE (handle)-[accesingObject:ACCESS {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(objectAccessed) "+
+              "WITH n,objectAccessed,handle,n.TimeCreated as date "+
+              "CREATE (handle)-[accesingObject:ACCESS {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(objectAccessed) "+
               "SET "+
-              "accesingObject.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "accesingObject.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "accesingObject.EventID = n.EventID, "+
               "accesingObject.AdditionalInfo = n.AdditionalInfo, "+
               "accesingObject.AccessMask = n.AccessMask, "+
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4672Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4672Repository.cs
index 7424441bfd90fb21ac6707515ddb3ec20c40bbd3..40b6709c154164c14567d55f1b710f68e7692c0e 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4672Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4672Repository.cs
@@ -22,9 +22,8 @@ namespace Visceral.Repository.Import.WindowsEvents
             IAsyncSession session = _driver.AsyncSession(o => o.WithDatabase("neo4j"));
             const string query = 
                "MATCH (n:WindowsEvent {EventID : \"4672\", Provider : \"Microsoft-Windows-Security-Auditing\"}) "+
-               "WITH n, split(n.TimeCreated, \".\") as date "+
-               "MATCH (computer:Computer)-[logonSession:LOG_ON_WITH_PRIVILEGES {TimeCreated : apoc.date.parse( date[0] + \".\" + " +
-               "toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(targetSs:Session {LogonId : n.SubjectLogonId}) "+
+               "WITH n, n.TimeCreated as date "+
+               "MATCH (computer:Computer)-[logonSession:LOG_ON_WITH_PRIVILEGES {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(targetSs:Session {LogonId : n.SubjectLogonId}) "+
                "WITH n,computer,logonSession,targetSs,date "+
                "SET logonSession.PrivilegeList = split(n.PrivilegeList, \"			\") "+
                "RETURN DISTINCT logonSession.PrivilegeList ";
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4727Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4727Repository.cs
index 61630a7d8490da2620ed47f22b2e951232f58ca7..23e5b4108b47af1105b8f40ae2d56bf53cc18c41 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4727Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4727Repository.cs
@@ -32,10 +32,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
               "ON CREATE SET  "+
               "subjectSession.LogonId = n.SubjectLogonId "+
-              "WITH n,subjectUser,subjectSession,split(n.TimeCreated, \".\") as date "+
-              "CREATE (subjectUser)-[usingSession:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(subjectSession) "+
+              "WITH n,subjectUser,subjectSession,n.TimeCreated as date "+
+              "CREATE (subjectUser)-[usingSession:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(subjectSession) "+
               "SET "+
-              "usingSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "usingSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "usingSession.EventID = n.EventID "+
               "RETURN usingSession";
  
@@ -56,10 +56,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                 "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
                 "ON CREATE SET  "+
                 "subjectSession.LogonId = n.SubjectLogonId "+
-                "WITH n,targetGroup,subjectSession,split(n.TimeCreated, \".\") as date "+
-                "CREATE (subjectSession)-[createGroup:CREATE {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(targetGroup) "+
+                "WITH n,targetGroup,subjectSession,n.TimeCreated as date "+
+                "CREATE (subjectSession)-[createGroup:CREATE {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(targetGroup) "+
                 "SET "+
-                "createGroup.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+                "createGroup.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                 "createGroup.EventID = n.EventID, "+
                 "createGroup.NewTargetUserName = n.NewTargetUserName, "+
                 "createGroup.OldTargetUserName = n.OldTargetUserName, "+
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4731Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4731Repository.cs
index c5bf603842ed689d96677427fc947193917c9106..d27e5431a841eb15ac8c9a78610dbacbfade92a5 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4731Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4731Repository.cs
@@ -28,14 +28,14 @@ namespace Visceral.Repository.Import.WindowsEvents
                "ON CREATE SET  "+
                "subjectUser.Username = n.SubjectUserName, "+
                "subjectUser.Sid = n.SubjectUserSid, "+
-              "subjectUser.DomainName = n.SubjectDomainName "+
+               "subjectUser.DomainName = n.SubjectDomainName "+
                "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
                "ON CREATE SET  "+
                "subjectSession.LogonId = n.SubjectLogonId "+
-               "WITH n,subjectUser,subjectSession,split(n.TimeCreated, \".\") as date "+
-               "CREATE (subjectUser)-[usingSession:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(subjectSession) "+
+               "WITH n,subjectUser,subjectSession,n.TimeCreated as date "+
+               "CREATE (subjectUser)-[usingSession:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(subjectSession) "+
                "SET "+
-               "usingSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+               "usingSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                "usingSession.EventID = n.EventID "+
                "RETURN usingSession";
                
@@ -57,10 +57,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
               "ON CREATE SET  "+
               "subjectSession.LogonId = n.SubjectLogonId "+
-              "WITH n,targetGroup,subjectSession,split(n.TimeCreated, \".\") as date "+
-              "CREATE (subjectSession)-[createGroup:CREATE {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(targetGroup) "+
+              "WITH n,targetGroup,subjectSession,n.TimeCreated as date "+
+              "CREATE (subjectSession)-[createGroup:CREATE {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(targetGroup) "+
               "SET "+
-              "createGroup.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "createGroup.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "createGroup.EventID = n.EventID, "+
               "createGroup.NewTargetUserName = n.NewTargetUserName, "+
               "createGroup.OldTargetUserName = n.OldTargetUserName, "+
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4738Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4738Repository.cs
index 36ae043557d820d0934a0e4822f53b9bc9a14935..2415ad5c5952191ad657a13359ad893a2a2a52a7 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4738Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4738Repository.cs
@@ -32,10 +32,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
               "ON CREATE SET  "+
               "subjectSession.LogonId = n.SubjectLogonId "+
-              "WITH n,subjectUser,subjectSession,split(n.TimeCreated, \".\") as date "+
-              "CREATE (subjectUser)-[usingSession:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(subjectSession) "+
+              "WITH n,subjectUser,subjectSession,n.TimeCreated as date "+
+              "CREATE (subjectUser)-[usingSession:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(subjectSession) "+
               "SET "+
-              "usingSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "usingSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "usingSession.EventID = n.EventID "+
               "RETURN usingSession";
  
@@ -57,10 +57,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
                "ON CREATE SET  "+
                "subjectSession.LogonId = n.SubjectLogonId "+
-               "WITH n,targetUser,subjectSession,split(n.TimeCreated, \".\") as date "+
-               "CREATE (subjectSession)-[editUser:EDIT {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(targetUser) "+
+               "WITH n,targetUser,subjectSession,n.TimeCreated as date "+
+               "CREATE (subjectSession)-[editUser:EDIT {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(targetUser) "+
                "SET "+
-               "editUser.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+               "editUser.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                "editUser.EventID = n.EventID, "+
                "editUser.PrivilegeList = n.PrivilegeList, "+
                "editUser.PasswordLastSet = n.PasswordLastSet, "+
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4781Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4781Repository.cs
index 93f8b31d1e0ecc8aa7e9040e52f7b2c12376f9f8..ab641e19ba2a494fcbc27e82ca634ff029859dbe 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4781Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4781Repository.cs
@@ -32,10 +32,10 @@ namespace Visceral.Repository.Import.WindowsEvents
               "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
               "ON CREATE SET  "+
               "subjectSession.LogonId = n.SubjectLogonId "+
-              "WITH n,subjectUser,subjectSession,split(n.TimeCreated, \".\") as date "+
-              "CREATE (subjectUser)-[usingSession:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(subjectSession) "+
+              "WITH n,subjectUser,subjectSession,n.TimeCreated as date "+
+              "CREATE (subjectUser)-[usingSession:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(subjectSession) "+
               "SET "+
-              "usingSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+              "usingSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
               "usingSession.EventID = n.EventID "+
               "RETURN usingSession";
  
@@ -57,10 +57,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) "+
                "ON CREATE SET  "+
                "subjectSession.LogonId = n.SubjectLogonId "+
-               "WITH n,targetUser,subjectSession,split(n.TimeCreated, \".\") as date "+
-               "CREATE (subjectSession)-[changeUsername:CHANGE {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(targetUser) "+
+               "WITH n,targetUser,subjectSession,n.TimeCreated as date "+
+               "CREATE (subjectSession)-[changeUsername:CHANGE {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(targetUser) "+
                "SET "+
-               "changeUsername.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+               "changeUsername.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                "changeUsername.EventID = n.EventID, "+
                "changeUsername.NewTargetUserName = n.NewTargetUserName, "+
                "changeUsername.OldTargetUserName = n.OldTargetUserName, "+
diff --git a/Visceral/Repository/Import/WindowsEvents/Event4907Repository.cs b/Visceral/Repository/Import/WindowsEvents/Event4907Repository.cs
index 52a85aae33f7950e11d830cac5c828fb42912a92..22bb40c6c91434c9466cdf8ae476f9dd1a66337a 100644
--- a/Visceral/Repository/Import/WindowsEvents/Event4907Repository.cs
+++ b/Visceral/Repository/Import/WindowsEvents/Event4907Repository.cs
@@ -34,10 +34,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                 "subjectUser.Sid = n.SubjectUserSid, " +
                 "subjectUser.Username = n.SubjectUserName, " +
                 "subjectUser.DomainName = n.SubjectDomainName " +
-                "WITH n,subjectUser,process,split(n.TimeCreated, \".\") as date " +
+                "WITH n,subjectUser,process,n.TimeCreated as date " +
                 "CREATE (process)-[processAs:AS]->(subjectUser) " +
                 "SET " +
-                "processAs.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), " +
+                "processAs.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                 "processAs.EventID = n.EventID " +
                 "RETURN processAs";
 
@@ -58,10 +58,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                 "MERGE (subjectSession:Session {LogonId : n.SubjectLogonId}) " +
                 "ON CREATE SET  " +
                 "subjectSession.LogonId = n.SubjectLogonId " +
-                "WITH n,subjectSession,subjectUser,split(n.TimeCreated, \".\") as date " +
-                "CREATE (subjectUser)-[usingSession:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(subjectSession) " +
+                "WITH n,subjectSession,subjectUser,n.TimeCreated as date " +
+                "CREATE (subjectUser)-[usingSession:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(subjectSession) " +
                 "SET " +
-                "usingSession.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), " +
+                "usingSession.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                 "usingSession.EventID = n.EventID " +
                 "RETURN usingSession";
 
@@ -80,10 +80,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                 "MERGE (handle:Handle {Id : n.HandleId}) "+
                 "ON CREATE SET  "+
                 "handle.Id = n.HandleId "+
-                "WITH n,subjectSession,handle,split(n.TimeCreated, \".\") as date "+
-                "CREATE (subjectSession)-[usingHandle:USING {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(handle) "+
+                "WITH n,subjectSession,handle,n.TimeCreated as date "+
+                "CREATE (subjectSession)-[usingHandle:USING {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(handle) "+
                 "SET "+
-                "usingHandle.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+                "usingHandle.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                 "usingHandle.EventID = n.EventID "+
                 "RETURN usingHandle";
 
@@ -106,10 +106,10 @@ namespace Visceral.Repository.Import.WindowsEvents
                 "objectAccessed.Sd = n.NewSd "+
                 "ON MATCH SET  "+
                 "objectAccessed.Sd = n.NewSd "+
-                "WITH n,objectAccessed,handle,split(n.TimeCreated, \".\") as date "+
-                "CREATE (handle)-[editObject:EDIT {TimeCreated : apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss')}]->(objectAccessed) "+
+                "WITH n,objectAccessed,handle,n.TimeCreated as date "+
+                "CREATE (handle)-[editObject:EDIT {TimeCreated : custom.date_EvtxToNeo4J(date)}]->(objectAccessed) "+
                 "SET "+
-                "editObject.TimeCreated = apoc.date.parse( date[0] + \".\" + toString(apoc.number.format(toInteger(date[1])/1000, \"000\")), 'ms', 'yyyy-MM-dd HH:mm:ss.sssssssss'), "+
+                "editObject.TimeCreated = custom.date_EvtxToNeo4J(date), "+
                 "editObject.EventID = n.EventID, "+
                 "editObject.NewSd = n.NewSd "+
                 "RETURN editObject";
diff --git a/Visceral/Services/API/DateService.cs b/Visceral/Services/API/DateService.cs
new file mode 100644
index 0000000000000000000000000000000000000000..47605913953dd7da04453b7a7aec9b2930799ea9
--- /dev/null
+++ b/Visceral/Services/API/DateService.cs
@@ -0,0 +1,13 @@
+namespace Visceral.Services.API
+{
+    public class DateService
+    {
+        /**
+         * Transforms a microsecond unix timestamp to a string that will be understood by Neo4J as a Datetime.
+         */
+        public static string? MicrosecondTimestampToNeo4JDatetimeString(long? timestamp)
+        {
+            return timestamp == null ? null : $"datetime({{ epochSeconds: {timestamp/1000000}, nanosecond: {(timestamp % 1000000)*1000} }})";
+        }
+    }
+}
\ No newline at end of file
diff --git a/Visceral/Services/API/RelationshipService.cs b/Visceral/Services/API/RelationshipService.cs
index 2d06093b0f68356db332ea6f8777c8c155d01880..351dc1c79b74731e24ccb81ee057cb90b123bbc4 100644
--- a/Visceral/Services/API/RelationshipService.cs
+++ b/Visceral/Services/API/RelationshipService.cs
@@ -15,17 +15,29 @@ namespace Visceral.Services.API
             {
                 throw new Exception("Relationships must contain a TimeCreated value");
             }
-            
+
+            ZonedDateTime timeCreated = (ZonedDateTime) relationship.Properties["TimeCreated"]; 
             IDictionary<string,object> visEdge = new Dictionary<string, object>
             {
+                { "id", relationship.Id },
                 { "from", relationship.StartNodeId },
                 { "to", relationship.EndNodeId },
                 { "label", relationship.Type },
                 { "group", relationship.Type },
-                { "timestamp", relationship.Properties["TimeCreated"] },
+                { "arrows", "to" },
+                { "timestamp", ZonedDateTimeToTimestamp(timeCreated) },
+                { "timestamp_microsecond", Math.Truncate((decimal) timeCreated.Nanosecond/1000) % 1000 },
                 { "properties" ,relationship.Properties }
             };
             return visEdge;
         }
+
+        /**
+         * ZonedDateTime from Neo4J driver to timestamp in milliseconds
+         */
+        private long ZonedDateTimeToTimestamp(ZonedDateTime datetime)
+        {
+            return datetime.ToDateTimeOffset().ToUnixTimeMilliseconds();
+        }
     }
 }
\ No newline at end of file
diff --git a/Visceral/Startup.cs b/Visceral/Startup.cs
index 854cc17701ce0f741706461936c5bc0bc1cc1104..f69ac47c35410710b98f8cfcfa66438fbdb22212 100644
--- a/Visceral/Startup.cs
+++ b/Visceral/Startup.cs
@@ -8,8 +8,6 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using Neo4j.Driver;
 using Visceral.Models.ConfigFiles;
-using Visceral.Repository;
-using Visceral.Services;
 using Microsoft.OpenApi.Models;
 using Visceral.Repository.API;
 using Visceral.Repository.Import;
@@ -20,7 +18,6 @@ namespace Visceral
 {
     public class Startup
     {
-        
         private IConfiguration Configuration { get; }
         
         public Startup(IConfiguration configuration)
@@ -49,7 +46,8 @@ namespace Visceral
             services.AddSingleton<ApiService>();
             services.AddSingleton<RelationshipService>();
             services.AddSingleton<PathService>();
-            services.AddSingleton<Neo4JDateService>();
+            services.AddSingleton<DateService>();
+            services.AddSingleton<CustomFunctionRepository>();
             
             // Register the Swagger generator, defining 1 or more Swagger documents
             services.AddSwaggerGen(c =>
@@ -63,8 +61,8 @@ namespace Visceral
                     Contact = new OpenApiContact
                     {
                         Name = "Visceral Taskforce",
-                        Email = string.Empty,
-                        Url = new Uri("https://twitter.com/VisceralTF")
+                        Email = "visceral_team@protonmail.com",
+                        Url = new Uri("https://twitter.com/Visceral_Team")
                     },
                     License = new OpenApiLicense
                     {
diff --git a/Visceral/Utils/CypherQueryBuilder.cs b/Visceral/Utils/CypherQueryBuilder.cs
index b4268830b7d8155e25beef8b04c3802acb7fae65..fc629d591d344ea87201ceeb7797658e8289f24a 100644
--- a/Visceral/Utils/CypherQueryBuilder.cs
+++ b/Visceral/Utils/CypherQueryBuilder.cs
@@ -249,14 +249,13 @@ namespace Visceral.Utils
         public async Task<IResultCursor> Exec()
         {
             //Debug
-            /*
             Console.WriteLine(Query);
             foreach (var queryParametersKey in _queryParameters.Keys)
             {
                Console.WriteLine(queryParametersKey+" "+_queryParameters[queryParametersKey]); 
             }
-            */
             //EndDebug
+            
             if (_queryParameters.Count == 0)
             {
                 return await _session.RunAsync(Query);
diff --git a/Visceral/Views/Home/Index.cshtml b/Visceral/Views/Home/Index.cshtml
index 427a521ac2d20e3551800333424a9dc2733d8947..82ff5f8bd8ebbfd35534c87b1c11116d51ad97ce 100644
--- a/Visceral/Views/Home/Index.cshtml
+++ b/Visceral/Views/Home/Index.cshtml
@@ -6,7 +6,7 @@
     <div role="main" class="pb-3">
         <div class="text-center">
             <h1 class="display-4">Welcome</h1>
-            <p>Learn about <a href="https://gitlab.com/BenLeg/visceral">The Visceral Project on GitLab</a>.</p>
+            <p>Learn about <a href="https://gitlab.com/visceraltaskforce/visceral">The Visceral Project on GitLab</a>.</p>
             <img src="~/images/visceral_logo.svg" alt="Logo Visceral"/>
             <p class="my-4 py-2 border-top"> &copy; 2020 - Visceral</p>
         </div>
diff --git a/Visceral/Views/Home/InvestigationGraph.cshtml b/Visceral/Views/Home/InvestigationGraph.cshtml
index ce18fd6910cf0fc0cb96e4321cc4b71973d18054..12386566a1287ed37e34bd47ca10be1f3638f200 100644
--- a/Visceral/Views/Home/InvestigationGraph.cshtml
+++ b/Visceral/Views/Home/InvestigationGraph.cshtml
@@ -59,32 +59,33 @@
 		    <div id="replay_activity_interval">
 			    <span title="Interval between steps in milliseconds.">
 			    	<input id="inpReplayActivityInterval" type="number" class="form-control" v-model="replay_activity.interval_ms" min="0" 
-			    	placeholder="Interval (ms)" :disabled="!(replay_activity.is_active ^ replay_activity.is_paused)"/>
+			    	placeholder="Interval (ms)" :disabled="Boolean(replay_activity.is_active ^ replay_activity.is_paused)"/>
 				</span>
 			</div>
 		    <div id="replay_activity_start" class="grid_center">
 		        <span title="Starts the animation">
-		            <button type="button" class="btn btn-outline-primary" v-on:click="replay_activity_start" :disabled="replay_activity.is_active && !replay_activity.is_paused">&#9199;</button>
+
+		            <button type="button" class="btn btn-outline-primary replay_activity_btn" v-on:click="replay_activity_start" :disabled="replay_activity.is_active && !replay_activity.is_paused">&#9199;</button>
 		        </span>
 		    </div>
 		    <div id="replay_activity_pause" class="grid_center">
 		        <span title="Pauses the animation">
-		            <button type="button" class="btn btn-outline-primary" v-on:click="replay_activity_pause" :disabled="!(replay_activity.is_active ^ replay_activity.is_paused)">&#9208;</button>
+		            <button type="button" class="btn btn-outline-primary replay_activity_btn" v-on:click="replay_activity_pause" :disabled="!(replay_activity.is_active ^ replay_activity.is_paused)">&#9208;</button>
 		        </span>
 		    </div>
 		    <div id="replay_activity_cancel" class="grid_center">
 		        <span title="Cancels the animation">
-		            <button type="button" class="btn btn-outline-primary" v-on:click="replay_activity_cancel" :disabled="!replay_activity.is_active">&#9209;</button>
+		            <button type="button" class="btn btn-outline-primary replay_activity_btn" v-on:click="replay_activity_cancel" :disabled="!replay_activity.is_active">&#9209;</button>
 		        </span>
 		    </div>
 		    <div id="replay_activity_prev" class="grid_center">
 		        <span title="Goes to the previous step">
-		            <button type="button" class="btn btn-outline-primary" v-on:click="replay_activity_prev_step" :disabled="!(replay_activity.is_active && !replay_activity_index_is_at_min)">&#9194;</button>
+		            <button type="button" class="btn btn-outline-primary replay_activity_btn" v-on:click="replay_activity_prev_step" :disabled="!(replay_activity.is_active && !replay_activity_index_is_at_min)">&#9194;</button>
 		        </span>
 		    </div>
 		    <div id="replay_activity_next" class="grid_center">
 		        <span title="Goes to the next step">
-		            <button type="button" class="btn btn-outline-primary" v-on:click="replay_activity_next_step" :disabled="replay_activity.is_active && replay_activity_index_is_at_max">&#9193;</button>
+		            <button type="button" class="btn btn-outline-primary replay_activity_btn" v-on:click="replay_activity_next_step" :disabled="replay_activity.is_active && replay_activity_index_is_at_max">&#9193;</button>
 		        </span>
 		    </div>
 		</div>
@@ -92,24 +93,62 @@
 			<div id="range_filter_title" class="grid_center">
 				<h4 class="grey">Date Range Filter</h4> 
 			</div>
-			<div id="label_range_start">
+			<div id="range_date_date_format_status" class="grid_center" v-text="range_display_mode_to_text"></div>
+			<div id="range_toggle_date_format" class="grid_center">
+				<label class="switch">
+            	    <input type="checkbox" v-model="range_date_filter.display_is_human_readable">
+            	    <span class="slider round" title="Toggles date format."></span>
+            	</label>	
+            </div>
+			<div id="range_label_start" class="grid_center">
 				<label for="range_start_time">Starting Date :</label>
 			</div>
-			<div id="range_start_time">
-				<input v-model="range_date_filter.start.time" type="time" name="start_time"/>
+			<div id="range_start_date" class="grid_center">
+				<transition name="fade">
+					<input v-if="range_date_filter.display_is_human_readable" v-model="range_date_filter.start.date" type="date" name="start_date"/>
+				</transition>
 			</div>
-			<div id="range_start_date">
-				<input v-model="range_date_filter.start.date" type="date" name="start_date"/>
+			<div id="range_start_time" class="grid_center">
+		    	<transition name="fade">
+					<input v-if="range_date_filter.display_is_human_readable" v-model="range_date_filter.start.time" type="time" name="start_time"/>
+        		</transition>
 			</div>
-			<div id="label_range_end" >
+			<div id="range_start_seconds_microseconds" class="grid_center">
+				<transition name="fade">
+            		<input v-if="range_date_filter.display_is_human_readable" v-model="range_date_filter.start.seconds_microseconds" 
+            		type="text" name="start_seconds_microseconds" placeholder="seconds.microsec" 
+            		pattern="[0-5]?[0-9]{1}\.[0-9]{1,6}" title="You need to respect the following format: second.microseconds"/>
+                </transition>
+            </div>
+			<div id="range_label_end" class="grid_center">
 				<label for="range_end_time">Ending Date :</label>
 			</div>
-			<div id="range_end_time" >
-				<input v-model="range_date_filter.end.time" type="time" name="end_time"/>
-			</div>
-			<div id="range_end_date" >
-				<input v-model="range_date_filter.end.date" type="date" name="end_date"/>
+			<div id="range_end_date" class="grid_center">
+            	<transition name="fade">
+            		<input v-if="range_date_filter.display_is_human_readable" v-model="range_date_filter.end.date" type="date" name="end_date"/>
+            	</transition>
+            </div>
+			<div id="range_end_time" class="grid_center">
+		    	<transition name="fade">
+					<input v-if="range_date_filter.display_is_human_readable" v-model="range_date_filter.end.time" type="time" name="end_time"/>
+        		</transition>
 			</div>
+			<div id="range_end_seconds_microseconds" class="grid_center">
+				<transition name="fade">
+            		<input v-if="range_date_filter.display_is_human_readable" v-model="range_date_filter.end.seconds_microseconds" 
+            		type="text" name="start_seconds_microseconds" placeholder="seconds.microsec"/>
+                </transition>
+            </div>
+			<div id="range_start_timestamp" class="grid_center">
+		    	<transition name="fade">
+					<input v-if="!range_date_filter.display_is_human_readable" v-model="range_date_filter.start.timestamp" type="number" min="0" step="1" placeholder="Timestamp microseconds.">
+        		</transition>
+        	</div>
+			<div id="range_end_timestamp" class="grid_center">
+		    	<transition name="fade">
+					<input v-if="!range_date_filter.display_is_human_readable" v-model="range_date_filter.end.timestamp" type="number" min="0" step="1" placeholder="Timestamp microseconds.">
+        		</transition>
+        	</div>
 		</div>
 		<transition name="fade">
         	<div v-if="menu.information.display_copied_alert" id="information_menu_alert_copy_clipboard" class="alert alert-success" role="alert">
@@ -133,6 +172,6 @@
 		</select>
 	</div>
 	<ul class='custom-menu'>
-		<li v-on:click="menu_selected_item(label)" :data-action="label" v-for="label in menu_extend_labels" v-text="label"/>
+		<li v-on:click="menu_selected_item(label)" :data-action="label" v-for="label in menu.information.extend.labels" v-text="label"/>
 	</ul>
 </div>
diff --git a/Visceral/Views/Shared/_Layout.cshtml b/Visceral/Views/Shared/_Layout.cshtml
index d7c96977bfdf719d41cba6c75f3da4b1bfd2b7e0..a794c6b4ccda2dba47dbde10142f6e61758b3c20 100644
--- a/Visceral/Views/Shared/_Layout.cshtml
+++ b/Visceral/Views/Shared/_Layout.cshtml
@@ -13,6 +13,7 @@
         <link rel="stylesheet" href="~/lib/vis-network/vis-network.css">
         <link rel="stylesheet" href="~/css/custom-menu.css">
         <link rel="stylesheet" href="~/css/investigation-graph.css">
+        <link rel="stylesheet" href="~/css/toggle_switch.css">
     }
     else{
         <link rel="stylesheet" href="~/css/site.css" />
diff --git a/Visceral/wwwroot/css/custom-menu.css b/Visceral/wwwroot/css/custom-menu.css
index 2455b56b8a8c28db54bcfdf797ba7ac272d37988..8e85fda31061643db092e6807000be1ecf14ce72 100644
--- a/Visceral/wwwroot/css/custom-menu.css
+++ b/Visceral/wwwroot/css/custom-menu.css
@@ -9,6 +9,8 @@
     background: #000;
     color: #FFF;
     border-radius: 5px;
+    list-style-type: none;
+    padding-left: 0;
 }
 
 .custom-menu li {
diff --git a/Visceral/wwwroot/css/investigation-graph.css b/Visceral/wwwroot/css/investigation-graph.css
index 8f03afb431f49fd182d3920b83960270a7225e31..e1da29feb824c91fb2c801844936d6f44b7f5faf 100644
--- a/Visceral/wwwroot/css/investigation-graph.css
+++ b/Visceral/wwwroot/css/investigation-graph.css
@@ -28,6 +28,11 @@
 	grid-row : 4;
 }
 
+#node_filter{
+	width: 50%;
+}
+
+/* Information menu (data displayed when a node or an edge is selected on the graph */
 #information_menu{
 	grid-column: 12/15;	
 	grid-row: 1/8;
@@ -54,6 +59,7 @@
 #information_menu_display{
 	grid-column: 1/7;
 	grid-row: 2/11;
+	overflow-y: scroll;
 }
 
 .information_menu_table{
@@ -84,6 +90,23 @@
 .information_menu_table tr:nth-child(even) {
 	background-color: #212528; /*#1b1e21;*/
 }
+
+#information_menu_alert_copy_clipboard{
+	grid-column: 1/7;
+	grid-row: 14/15;
+}
+
+#information_menu_date_filter{
+	grid-column: 1/7;
+	grid-row: 15/17;
+
+	/* Sub Grid definition */
+	display: inline-grid;
+	grid-template-columns: repeat(12, 1fr);
+	grid-template-rows: repeat(6, 1fr);
+}
+
+/* Replay activity menu (Section helping the user to replay activities in the graph) */
 #replay_activity_menu{
 	grid-column: 1/7;
 	grid-row: 11/13;
@@ -131,59 +154,81 @@
 	grid-row: 2;
 }
 
-#information_menu_alert_copy_clipboard{
-	grid-column: 1/7;
-	grid-row: 14/15;
+.replay_activity_btn{
+	font-size: 1.3em;
 }
 
-#information_menu_date_filter{
-	grid-column: 1/7;
-	grid-row: 15/17;
+/* Range date filter for the graph */
 
-    /* Sub Grid definition */
-	display: inline-grid;
-	grid-template-columns: repeat(6, 1fr);
-	grid-template-rows: repeat(3, 1fr);
+#range_filter_title{
+	grid-column: 1/9;
+	grid-row: 1/3;
 }
 
-#range_filter_title{
-	grid-column: 1/7;
-	grid-row: 1;
+#range_date_date_format_status{
+	grid-column: 9/11;
+	grid-row: 1/3;
 }
 
-#label_range_start{
-	grid-column: 1/3;
-	grid-row: 2;
+#range_toggle_date_format{
+	grid-column: 11/13;
+	grid-row: 1/3;
 }
 
-#range_start_time{
-	grid-column: 3/4;
-	grid-row: 2;
+#range_label_start{
+	grid-column: 1/3;
+	grid-row: 3/5;
 }
 
 #range_start_date{
-	grid-column: 5/7;
-	grid-row: 2;
+	grid-column: 3/7;
+	grid-row: 3/5;
+}
+
+#range_start_time{
+	grid-column: 7/9;
+	grid-row: 3/5;
 }
 
+#range_start_seconds_microseconds{
+	grid-column: 9/13;
+	grid-row: 3/5;
+    width: 100%;
+	overflow: hidden;
+}
 
-#label_range_end{
+#range_label_end{
 	grid-column: 1/3;
-	grid-row: 3;
+	grid-row: 5/7;
+}
+
+#range_end_date{
+	grid-column: 3/7;
+	grid-row: 5/7;
 }
 
 #range_end_time{
-	grid-column: 3/4;
-	grid-row: 3;
+	grid-column: 7/9;
+	grid-row: 5/7;
 }
 
-#range_end_date{
-	grid-column: 5/7;
-	grid-row: 3;
+#range_end_seconds_microseconds{
+	grid-column: 9/13;
+	grid-row: 5/7;
+	width: 100%;
+    overflow: hidden;
 }
 
-#node_filter{
-	width: 50%;
+#range_start_timestamp{
+	grid-column: 4/12;
+	grid-row: 3/5;
+    justify-self: center;
+}
+
+#range_end_timestamp{
+	grid-column: 4/12;
+	grid-row: 5/7;
+	justify-self: center;
 }
 
 /* Other classes more generic */
diff --git a/Visceral/wwwroot/css/toggle_switch.css b/Visceral/wwwroot/css/toggle_switch.css
new file mode 100644
index 0000000000000000000000000000000000000000..4c8cb61a144f72cdb8053fdab6e394e89d46aca6
--- /dev/null
+++ b/Visceral/wwwroot/css/toggle_switch.css
@@ -0,0 +1,64 @@
+/* Slider toggle checkbox taken from https://www.w3schools.com/howto/howto_css_switch.asp website.
+
+/* The switch - the box around the slider */
+.switch {
+    position: relative;
+    display: inline-block;
+    width: 60px;
+    height: 34px;
+}
+
+/* Hide default HTML checkbox */
+.switch input {
+    opacity: 0;
+    width: 0;
+    height: 0;
+}
+
+/* The slider */
+.slider {
+    position: absolute;
+    cursor: pointer;
+    top: 0;
+    left: 0;
+    right: 0;
+    bottom: 0;
+    background-color: #ccc;
+    -webkit-transition: .4s;
+    transition: .4s;
+}
+
+.slider:before {
+    position: absolute;
+    content: "";
+    height: 26px;
+    width: 26px;
+    left: 4px;
+    bottom: 4px;
+    background-color: white;
+    -webkit-transition: .4s;
+    transition: .4s;
+}
+
+input:checked + .slider {
+    background-color: #2196F3;
+}
+
+input:focus + .slider {
+    box-shadow: 0 0 1px #2196F3;
+}
+
+input:checked + .slider:before {
+    -webkit-transform: translateX(26px);
+    -ms-transform: translateX(26px);
+    transform: translateX(26px);
+}
+
+/* Rounded sliders */
+.slider.round {
+    border-radius: 34px;
+}
+
+.slider.round:before {
+    border-radius: 50%;
+}
\ No newline at end of file
diff --git a/Visceral/wwwroot/images/visceral_client.gif b/Visceral/wwwroot/images/visceral_client.gif
new file mode 100644
index 0000000000000000000000000000000000000000..59bb0d75a9059c4e318b97125d3f6131b8be1158
Binary files /dev/null and b/Visceral/wwwroot/images/visceral_client.gif differ
diff --git a/Visceral/wwwroot/js/api.js b/Visceral/wwwroot/js/api.js
index 4d31ec535b4907a6c4c8158b2a96888989e7474f..279cc8eb39e49f79a109be2e6e68881caa2aa08f 100644
--- a/Visceral/wwwroot/js/api.js
+++ b/Visceral/wwwroot/js/api.js
@@ -64,6 +64,8 @@ const api = new (class Api{
      * Query getting the extended nodes by label from a given id node
      * @param {Number} nodeId - identifier of the selected node
      * @param {String} labelFilter - label of the ending nodes to be extended
+     * @param {Number} startDate - starting date of the date filter, value as timestamp in microseconds
+     * @param {Number} endDate - ending date of the date filter, value as timestamp in microseconds
      * @returns {Promise<Map<string,Object>>} returns the data from the query or the error
      */
     async queryExtendNodeByLabel(nodeId,labelFilter,startDate, endDate){
@@ -73,11 +75,11 @@ const api = new (class Api{
         if(typeof labelFilter !== "string"){
             throw new Error(`[api.queryNodeByIdExtend] labelFilter parameter must be a number. Given identity was ${labelFilter} of type ${typeof labelFilter}`);
         }
-        if(startDate && typeof startDate !== "string"){
-            throw new Error(`[api.queryNodeByIdExtend] startDate parameter must be a string. Given identity was ${startDate} of type ${typeof startDate}`);
+        if(startDate && typeof startDate !== "number"){
+            throw new Error(`[api.queryNodeByIdExtend] startDate parameter must be a number. Given identity was ${startDate} of type ${typeof startDate}`);
         }
-        if(endDate && typeof endDate !== "string"){
-            throw new Error(`[api.queryNodeByIdExtend] endDate parameter must be a string. Given identity was ${endDate} of type ${typeof endDate}`);
+        if(endDate && typeof endDate !== "number"){
+            throw new Error(`[api.queryNodeByIdExtend] endDate parameter must be a number. Given identity was ${endDate} of type ${typeof endDate}`);
         }
         
         let api_request = `/api/nodes/${nodeId}/extend/?label=${labelFilter}&limit=100`;
@@ -85,6 +87,7 @@ const api = new (class Api{
         if(startDate) api_request += `&startDate=${startDate}`; 
         if(endDate) api_request += `&endDate=${endDate}`;
         
+        console.log(api_request);
         return await this.Get(api_request);
     }
 
@@ -95,4 +98,13 @@ const api = new (class Api{
     async queryOrientedNavigationMap(){
         return await this.Get("/api/labels/neighbours/outer/");
     }
+
+    /**
+     * Query neighbour labels of a given node selected by its id
+     * @param id Id of the selected node
+     * @returns {Promise<*>}
+     */
+    async queryNeighbourLabelsFromNodeId(id){
+        return await this.Get(`/api/nodes/${id}/neighbour/labels`);
+    }
 })();
diff --git a/Visceral/wwwroot/js/investigation-graph.js b/Visceral/wwwroot/js/investigation-graph.js
index ee3883be4a767831375bd2ca81a6f8c8ecf2eb11..5c9763b2453c9be61f07a1c9bf5bdf871d3c780d 100644
--- a/Visceral/wwwroot/js/investigation-graph.js
+++ b/Visceral/wwwroot/js/investigation-graph.js
@@ -34,7 +34,6 @@ const app = new Vue({
 	el: "#app",
 	data: {
 		general_informations : {
-			oriented_navigation: {},
 			labels: [],
 			labelToId: {
 				User: "Username",
@@ -48,13 +47,18 @@ const app = new Vue({
 			}
 		},
 		range_date_filter: {
+			display_is_human_readable : false,
 			start: {
 				date: "",
-				time: ""
+				time: "",
+				seconds_microseconds:"",
+				timestamp: null
 			},
 			end: {
 				date: "",
-				time: ""
+				time: "",
+				seconds_microseconds:"",
+				timestamp: null,
 			}
 		},
         menu : {
@@ -63,7 +67,10 @@ const app = new Vue({
 					type: "",
 					data: {}
 				},
-				display_copied_alert : false
+				display_copied_alert : false,
+				extend : {
+					labels : []
+				}
 			},	
             first_node_selection : {
 				state : "menuStartingLabel",
@@ -82,7 +89,7 @@ const app = new Vue({
 		    interval : null,
 			is_active : false,
 			is_paused : false,
-			index : 0,
+			index : -1,
 			timeline : [],
 			interval_ms : 1500
 		}  
@@ -91,12 +98,6 @@ const app = new Vue({
 		display_property: function () {
 			return this.general_informations.labelToId[this.menu.first_node_selection.starting_label]
 		},
-		menu_extend_labels: function () {
-			//console.log(this.menu.first_node_selection.network_menu_node);
-			if (this.menu.first_node_selection.network_menu_node.hasOwnProperty("group")) {
-				return this.general_informations.oriented_navigation[this.menu.first_node_selection.network_menu_node.group];
-			} else return [];
-		},
 		range_start_date: function () {
 			return this.strings_to_date("start")
 		},
@@ -124,6 +125,9 @@ const app = new Vue({
 		},
 		replay_activity_index_is_at_max : function(){
 			return this.replay_activity.index === this.replay_activity_timeline_last_elt_index;
+		},
+		range_display_mode_to_text : function () {
+			return this.range_date_filter.display_is_human_readable ? "Date" : "Timestamp";
 		}
 	},
 	watch: {
@@ -141,24 +145,38 @@ const app = new Vue({
 				}
 			})
 		},
-		"menu.first_node_selection.starting_node": async function (new_starting_node_id,) {
+		"menu.first_node_selection.starting_node": async function (new_starting_node_id) {
 			if(new_starting_node_id === undefined) return; //If the starting node is not created yet, stop
 			this.menu.first_node_selection.state = "Network";
 			const node = await api.queryNodeById(new_starting_node_id);
 			network.data.nodes.add(node);
 			network.instance = new vis.Network(document.getElementById(this.vis.container_id), network.data, network.options);
-			network.instance.on('doubleClick', this.double_click_menu_handler);
+			network.instance.on('doubleClick', (evt) => this.double_click_menu_handler(evt));
 			network.instance.on('click',this.click_display_info_handler);
+		},
+		"range_date_filter.display_is_human_readable": function(){
+			let elt_selected = this.menu.information.elt_selected;
+			let edge = elt_selected.data;
+		    if(elt_selected.type === "edge"){
+		    	this.menu.information.elt_selected.data.properties.TimeCreated = 
+					this.timestamp_to_chosen_format(edge.timestamp,edge.timestamp_microsecond);
+			}
 		}
 	},
 	methods: {
 		//When element clicked in menu this method is called, and the label of the clicked node is given
 		menu_selected_item: function (label) {
-			const date_range = {
-				start: this.range_start_date,
-				end: this.range_end_date
-			};
-			//console.log(date_range);
+			const date_range = {};
+			if(this.range_date_filter.display_is_human_readable){
+				date_range.start = this.range_start_date;
+				date_range.end = this.range_end_date;
+			}
+			else{
+				date_range.start = Number(this.range_date_filter.start.timestamp);
+				date_range.end = Number(this.range_date_filter.end.timestamp);
+			}
+			
+			console.log(date_range);
 
 			api.queryExtendNodeByLabel(this.menu.first_node_selection.network_menu_node.id, label,date_range.start,date_range.end).then((result) => {
 				//Slower but safer method, if one node/edge already exists, skip it and continue import
@@ -188,23 +206,48 @@ const app = new Vue({
 			});
 		},
 		strings_to_date: function (type) {
-			let date = null;
 			//If date is given, create it
 			if (this.range_date_filter[type].date !== "") {
-				date = this.range_date_filter[type].date;
-				//If time is given, adds it to the date object
+			    const date = new Date(this.range_date_filter[type].date);				
+			    
+				//If hour and minutes are given, adds it to the date object
 				if(this.range_date_filter[type].time !== ""){
-					date += "-" + this.range_date_filter[type].time;
+				    const time_splitted = this.range_date_filter[type].time.split(":");
+				    date.setHours(Number(time_splitted[0]));
+				    date.setMinutes(Number(time_splitted[1]));
 				}
-				else{ //Else, consider the time is set to 00:00
-					date +="-00:00"
+				//If seconds and microseconds are given, adds it to the date object
+				if(this.range_date_filter[type].seconds_microseconds !== ""){
+				    let s_micros = Number(this.range_date_filter[type].seconds_microseconds); 
+				    let seconds = Math.trunc(s_micros);
+				    let milliseconds = Math.trunc((s_micros % 1).toFixed(6).split(".")[1]/1000);
+					let microseconds = (s_micros % 1).toFixed(6).split(".")[1] % 1000;
+					date.setSeconds(seconds);
+					date.setMilliseconds(milliseconds);
+					return date.getTime()*1000 + microseconds;
 				}
+				return date.getTime()*1000;
 			}
-			return date;
+			return null;
+		},
+		timestamp_to_timestamp_microsecond: function(timestamp,timestamp_microsecond){
+			return timestamp * 1000 + timestamp_microsecond;
+		},
+		timestamp_to_human_readable_date: function(timestamp,timestamp_microsecond){
+			let dt = new Date(timestamp);
+			return `${dt.getFullYear()}-${dt.getMonth()+1}-${dt.getDate()} `
+				+ `${dt.getHours()}:${dt.getMinutes()}:${dt.getSeconds()}.${(dt.getUTCMilliseconds()*1000) + timestamp_microsecond}`;
+		},
+		timestamp_to_chosen_format: function(timestamp,timestamp_microsecond){
+			if (this.range_date_filter.display_is_human_readable)
+				return this.timestamp_to_human_readable_date(timestamp,timestamp_microsecond);
+			else
+				return this.timestamp_to_timestamp_microsecond(timestamp,timestamp_microsecond);	
 		},
-		double_click_menu_handler: function (evt) {
+		double_click_menu_handler: async function (evt) {
 			if (evt.nodes.length === 1) {//If the double click was on an event
 				this.menu.first_node_selection.network_menu_node = network.data.nodes.get(evt.nodes[0]);
+				this.menu.information.extend.labels = await api.queryNeighbourLabelsFromNodeId(this.menu.first_node_selection.network_menu_node.id);
 				$(".custom-menu").finish().toggle(100);//Display menu
 				$(".custom-menu").css({ //Position of the menu
 					top: evt.pointer.DOM.y + "px",
@@ -222,6 +265,7 @@ const app = new Vue({
 				let edge = network.data.edges.get(evt.edges[0]);
 				edge.from = network.data.nodes.get(edge.from).label;
 				edge.to = network.data.nodes.get(edge.to).label;
+				edge.properties.TimeCreated = this.timestamp_to_chosen_format(edge.timestamp,edge.timestamp_microsecond); 
 				this.menu.information.elt_selected = { type: "edge", data: edge };
 				return;
 			}
@@ -259,7 +303,11 @@ const app = new Vue({
 
 			return Object.keys(objectClusteredRel)
 				.map(key => objectClusteredRel[key])
-				.sort((a, b) => new Date(b[0].timestamp) - new Date(a[0].timestamp))
+				.sort((a, b) =>{
+				    timestamp_a_ms = a[0].timestamp * 1000 + a[0].timestamp_microsecond;
+					timestamp_b_ms = b[0].timestamp * 1000 + b[0].timestamp_microsecond;
+					return timestamp_a_ms - timestamp_b_ms;
+				})
 				.map(group => group.map(rel => rel.id))
 		},
 		//Selects consecutively the nodes in the array passed, every X milliseconds
@@ -292,12 +340,11 @@ const app = new Vue({
 		replay_activity_cancel : function () {
 			clearInterval(this.replay_activity.interval);
 			this.replay_activity.interval = null;
-			this.replay_activity.index = 0;
+			this.replay_activity.index = -1;
 			this.replay_activity.timeline = [];
 			this.replay_activity.is_paused = false;
 			this.replay_activity.is_active = false;
 			network.instance.selectEdges([]);
-			console.log("Cancel");
 		},
 		replay_activity_prev_step : function () {
 			if (this.replay_activity_timeline_is_empty) return;
@@ -340,7 +387,6 @@ const app = new Vue({
 (async ()=>{
 	try{
 		app._data.general_informations.labels = await api.queryLabels();
-		app._data.general_informations.oriented_navigation = await api.queryOrientedNavigationMap();
 	} catch	(error){
 		console.error(error);
 	}
diff --git a/docker-compose.yml b/docker-compose.yml
index 3c7b285f24fadff93e291642ca5ed7e30db23014..d946296fb73e9e7d2b6cf5342374c4d4b8990f4a 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -8,13 +8,14 @@ services:
       - "7474:7474"
       - "7687:7687"
     environment:
-      NEO4J_AUTH: "neo4j/bite"
+      NEO4J_AUTH: "neo4j/visceral"
       NEO4J_dbms_connector_bolt_advertised__address: "localhost:7687"
       NEO4J_apoc_import_file_enabled: "true"
       NEO4J_apoc_import_file_use__neo4j__config: "false"
       NEO4J_dbms_memory_heap_initial__size: "4G"
       NEO4J_dbms_memory_heap_max__size: "4G"
       NEO4J_dbms_memory_pagecache_size: "6G"
+      NEO4J_dbms_security_procedures_unrestricted: "apoc.*"
     volumes:
       - "dbdata:/data"
       - "importedfiles:/tmp/upload/shared/"