diff --git a/Assets/HoneyFramework/Scripts/CameraControler.cs b/HoneyFramework/Scripts/CameraControler.cs
index 32ad0da..774baca 100644
--- a/Assets/HoneyFramework/Scripts/CameraControler.cs
+++ b/HoneyFramework/Scripts/CameraControler.cs
@@ -125,14 +125,14 @@ namespace HoneyFramework
                 {
                     DataManager.Reload();
                     World.GetInstance().Initialize();
-                    AstarPath.RegisterSafeUpdate(GameManager.instance.ActivatePathfinder);
+                    GameManager.instance.ActivatePathfinder();
                 }

                 if (GUILayout.Button("Load map"))
                 {
                     DataManager.Reload();
                     World.GetInstance().InitializeFromSave();
-                    AstarPath.RegisterSafeUpdate(GameManager.instance.ActivatePathfinder);
+                    GameManager.instance.ActivatePathfinder();
                 }
             }
             else if (World.GetInstance().status == World.Status.Ready)
@@ -141,14 +141,14 @@ namespace HoneyFramework
                 {
                     DataManager.Reload();
                     World.GetInstance().Initialize();
-                    AstarPath.RegisterSafeUpdate(GameManager.instance.ActivatePathfinder);
+                    GameManager.instance.ActivatePathfinder();
                 }

                 if (GUILayout.Button("Load map"))
                 {
                     DataManager.Reload();
                     World.GetInstance().InitializeFromSave();
-                    AstarPath.RegisterSafeUpdate(GameManager.instance.ActivatePathfinder);
+                    GameManager.instance.ActivatePathfinder();
                 }

                 if (GUILayout.Button("Spawn character"))
diff --git a/Assets/HoneyFramework/Scripts/GameManager.cs b/HoneyFramework/Scripts/GameManager.cs
index f86b3d1..5453cb5 100644
--- a/Assets/HoneyFramework/Scripts/GameManager.cs
+++ b/HoneyFramework/Scripts/GameManager.cs
@@ -69,8 +69,8 @@ namespace HoneyFramework
         /// <returns></returns>
         public void ActivatePathfinder()
         {
-            HexGraph hg = HexPathFinder.GenerateWorldGraph(pathFinder);
-            pathFinder.graphs = new NavGraph[1] { hg };
+            pathFinder.data.AddGraph(typeof(HexGraph));
+            pathFinder.Scan();
         }
     }
 }
diff --git a/Assets/HoneyFramework/Scripts/World/HexTools/HexGraph.cs b/HoneyFramework/Scripts/World/HexTools/HexGraph.cs
index 1e9c597..ae2e705 100644
--- a/Assets/HoneyFramework/Scripts/World/HexTools/HexGraph.cs
+++ b/HoneyFramework/Scripts/World/HexTools/HexGraph.cs
@@ -3,7 +3,7 @@ using System.Collections;
 using System.Collections.Generic;
 using System.Linq;
 using Pathfinding;
-using Pathfinding.Serialization.JsonFx;
+using Pathfinding.Serialization;

 namespace HoneyFramework
 {
@@ -20,7 +20,7 @@ namespace HoneyFramework
         /// </summary>
         /// <param name="statusCallback"></param>
         /// <returns></returns>
-        public override void ScanInternal(OnScanStatus statusCallback)
+        protected override IEnumerable<Progress> ScanInternal()
         {
             int hexradius = World.instance.hexRadius;
             List<PointNode> pointNodes = new List<PointNode>();
@@ -43,27 +43,25 @@ namespace HoneyFramework
             nodes = pointNodes.ToArray();
             nodeCount = nodes.Length;

-            List<PointNode> connections = new List<PointNode>();
-            List<uint> connectionCosts = new List<uint>();
+            List<Connection> connections = new List<Connection>();

             foreach (PointNode pn in nodes)
             {
                 connections.Clear();
-                connectionCosts.Clear();
                 foreach (Vector3i v in HexNeighbors.neighbours)
                 {
                     Int3 offset = v.ToInt3();
                     Int3 pos = pn.position + offset;
                     if (nodeDictionary.ContainsKey(pos))
                     {
-                        connections.Add(nodeDictionary[pos]);
-                        connectionCosts.Add(1);
+                        connections.Add(new Connection(nodeDictionary[pos], 1));
                     }
                 }

                 pn.connections = connections.ToArray();
-                pn.connectionCosts = connectionCosts.ToArray();
             }
+
+            yield return new Progress(1.0f, "Done");
         }
     }
 }
\ No newline at end of file
diff --git a/Assets/HoneyFramework/Scripts/World/HexTools/HexPathFinder.cs b/Assets/HoneyFramework/Scripts/World/HexTools/HexPathFinder.cs
deleted file mode 100644
index f99007c..0000000
--- a/Assets/HoneyFramework/Scripts/World/HexTools/HexPathFinder.cs
+++ /dev/null
@@ -1,24 +0,0 @@
-using UnityEngine;
-using System.Collections;
-using System.Collections.Generic;
-using System.Linq;
-using Pathfinding;
-
-namespace HoneyFramework
-{
-    /*
-     * Simple call to produce world graph. More functionality could be provided to cover or translate advantages of the A* into hex world
-     */
-    public class HexPathFinder
-    {
-        static public HexGraph GenerateWorldGraph(AstarPath pathfinder)
-        {
-            HexGraph graph = new HexGraph();
-            graph.active = pathfinder;
-            graph.ScanInternal(null);
-
-            return graph;
-        }
-
-    }
-}
\ No newline at end of file