diff --git a/components/CMakeLists.txt b/components/CMakeLists.txt
index 06ae0791d7..7860f492ce 100644
--- a/components/CMakeLists.txt
+++ b/components/CMakeLists.txt
@@ -183,6 +183,7 @@ add_component_dir(detournavigator
     raycast
     navmeshtileview
     oscillatingrecastmeshobject
+    offmeshconnectionsmanager
     )
 
 set (ESM_UI ${CMAKE_SOURCE_DIR}/files/ui/contentselector.ui
diff --git a/components/detournavigator/makenavmesh.cpp b/components/detournavigator/makenavmesh.cpp
index bcfd1b22fd..422fdffb1d 100644
--- a/components/detournavigator/makenavmesh.cpp
+++ b/components/detournavigator/makenavmesh.cpp
@@ -389,7 +389,7 @@ namespace
 
         const auto offMeshConVerts = getOffMeshVerts(offMeshConnections);
         const std::vector<float> offMeshConRad(offMeshConnections.size(), getRadius(settings, agentHalfExtents));
-        const std::vector<unsigned char> offMeshConDir(offMeshConnections.size(), DT_OFFMESH_CON_BIDIR);
+        const std::vector<unsigned char> offMeshConDir(offMeshConnections.size(), 0);
         const std::vector<unsigned char> offMeshConAreas = getOffMeshConAreas(offMeshConnections);
         const std::vector<unsigned short> offMeshConFlags = getOffMeshFlags(offMeshConnections);
 
diff --git a/components/detournavigator/navigatorimpl.cpp b/components/detournavigator/navigatorimpl.cpp
index b7b3bbd586..1aa4768de5 100644
--- a/components/detournavigator/navigatorimpl.cpp
+++ b/components/detournavigator/navigatorimpl.cpp
@@ -55,12 +55,10 @@ namespace DetourNavigator
     {
         if (addObject(id, static_cast<const ObjectShapes&>(shapes), transform))
         {
-            mNavMeshManager.addOffMeshConnection(
-                id,
-                toNavMeshCoordinates(mSettings, shapes.mConnectionStart),
-                toNavMeshCoordinates(mSettings, shapes.mConnectionEnd),
-                AreaType_door
-            );
+            const osg::Vec3f start = toNavMeshCoordinates(mSettings, shapes.mConnectionStart);
+            const osg::Vec3f end = toNavMeshCoordinates(mSettings, shapes.mConnectionEnd);
+            mNavMeshManager.addOffMeshConnection(id, start, end, AreaType_door);
+            mNavMeshManager.addOffMeshConnection(id, end, start, AreaType_door);
             return true;
         }
         return false;
diff --git a/components/detournavigator/offmeshconnectionsmanager.cpp b/components/detournavigator/offmeshconnectionsmanager.cpp
new file mode 100644
index 0000000000..a673ae3e68
--- /dev/null
+++ b/components/detournavigator/offmeshconnectionsmanager.cpp
@@ -0,0 +1,95 @@
+#include "offmeshconnectionsmanager.hpp"
+#include "settings.hpp"
+#include "settingsutils.hpp"
+#include "tileposition.hpp"
+#include "objectid.hpp"
+#include "offmeshconnection.hpp"
+
+#include <algorithm>
+#include <vector>
+#include <set>
+
+namespace DetourNavigator
+{
+    OffMeshConnectionsManager::OffMeshConnectionsManager(const Settings& settings)
+        : mSettings(settings)
+    {}
+
+    void OffMeshConnectionsManager::add(const ObjectId id, const OffMeshConnection& value)
+    {
+        const auto values = mValues.lock();
+
+        values->mById.insert(std::make_pair(id, value));
+
+        const auto startTilePosition = getTilePosition(mSettings, value.mStart);
+        const auto endTilePosition = getTilePosition(mSettings, value.mEnd);
+
+        values->mByTilePosition[startTilePosition].insert(id);
+
+        if (startTilePosition != endTilePosition)
+            values->mByTilePosition[endTilePosition].insert(id);
+    }
+
+    std::set<TilePosition> OffMeshConnectionsManager::remove(const ObjectId id)
+    {
+        const auto values = mValues.lock();
+
+        const auto byId = values->mById.equal_range(id);
+
+        if (byId.first == byId.second)
+            return {};
+
+        std::set<TilePosition> removed;
+
+        std::for_each(byId.first, byId.second, [&] (const auto& v) {
+            const auto startTilePosition = getTilePosition(mSettings, v.second.mStart);
+            const auto endTilePosition = getTilePosition(mSettings, v.second.mEnd);
+
+            removed.emplace(startTilePosition);
+            if (startTilePosition != endTilePosition)
+                removed.emplace(endTilePosition);
+        });
+
+        for (const TilePosition& tilePosition : removed)
+        {
+            const auto it = values->mByTilePosition.find(tilePosition);
+            if (it == values->mByTilePosition.end())
+                continue;
+            it->second.erase(id);
+            if (it->second.empty())
+                values->mByTilePosition.erase(it);
+        }
+
+        values->mById.erase(byId.first, byId.second);
+
+        return removed;
+    }
+
+    std::vector<OffMeshConnection> OffMeshConnectionsManager::get(const TilePosition& tilePosition)
+    {
+        std::vector<OffMeshConnection> result;
+
+        const auto values = mValues.lock();
+
+        const auto itByTilePosition = values->mByTilePosition.find(tilePosition);
+
+        if (itByTilePosition == values->mByTilePosition.end())
+            return result;
+
+        std::for_each(itByTilePosition->second.begin(), itByTilePosition->second.end(),
+            [&] (const ObjectId v)
+            {
+                const auto byId = values->mById.equal_range(v);
+                std::for_each(byId.first, byId.second, [&] (const auto& v)
+                {
+                    if (getTilePosition(mSettings, v.second.mStart) == tilePosition
+                            || getTilePosition(mSettings, v.second.mEnd) == tilePosition)
+                        result.push_back(v.second);
+                });
+            });
+
+        std::sort(result.begin(), result.end());
+
+        return result;
+    }
+}
diff --git a/components/detournavigator/offmeshconnectionsmanager.hpp b/components/detournavigator/offmeshconnectionsmanager.hpp
index 1ad96e3b97..20a6427cd5 100644
--- a/components/detournavigator/offmeshconnectionsmanager.hpp
+++ b/components/detournavigator/offmeshconnectionsmanager.hpp
@@ -2,16 +2,12 @@
 #define OPENMW_COMPONENTS_DETOURNAVIGATOR_OFFMESHCONNECTIONSMANAGER_H
 
 #include "settings.hpp"
-#include "settingsutils.hpp"
 #include "tileposition.hpp"
 #include "objectid.hpp"
 #include "offmeshconnection.hpp"
 
 #include <components/misc/guarded.hpp>
 
-#include <osg/Vec3f>
-
-#include <algorithm>
 #include <map>
 #include <unordered_set>
 #include <vector>
@@ -22,73 +18,13 @@ namespace DetourNavigator
     class OffMeshConnectionsManager
     {
     public:
-        OffMeshConnectionsManager(const Settings& settings)
-            : mSettings(settings)
-        {}
+        OffMeshConnectionsManager(const Settings& settings);
 
-        void add(const ObjectId id, const OffMeshConnection& value)
-        {
-            const auto values = mValues.lock();
+        void add(const ObjectId id, const OffMeshConnection& value);
 
-            values->mById.insert(std::make_pair(id, value));
+        std::set<TilePosition> remove(const ObjectId id);
 
-            const auto startTilePosition = getTilePosition(mSettings, value.mStart);
-            const auto endTilePosition = getTilePosition(mSettings, value.mEnd);
-
-            values->mByTilePosition[startTilePosition].insert(id);
-
-            if (startTilePosition != endTilePosition)
-                values->mByTilePosition[endTilePosition].insert(id);
-        }
-
-        std::set<TilePosition> remove(const ObjectId id)
-        {
-            const auto values = mValues.lock();
-
-            const auto byId = values->mById.equal_range(id);
-
-            if (byId.first == byId.second) {
-                return {};
-            }
-
-            std::set<TilePosition> removed;
-
-            std::for_each(byId.first, byId.second, [&] (const auto& v) {
-                const auto startTilePosition = getTilePosition(mSettings, v.second.mStart);
-                const auto endTilePosition = getTilePosition(mSettings, v.second.mEnd);
-
-                removed.emplace(startTilePosition);
-                if (startTilePosition != endTilePosition)
-                    removed.emplace(endTilePosition);
-            });
-
-            values->mById.erase(byId.first, byId.second);
-
-            return removed;
-        }
-
-        std::vector<OffMeshConnection> get(const TilePosition& tilePosition)
-        {
-            std::vector<OffMeshConnection> result;
-
-            const auto values = mValues.lock();
-
-            const auto itByTilePosition = values->mByTilePosition.find(tilePosition);
-
-            if (itByTilePosition == values->mByTilePosition.end())
-                return result;
-
-            std::for_each(itByTilePosition->second.begin(), itByTilePosition->second.end(),
-                [&] (const ObjectId v)
-                {
-                    const auto byId = values->mById.equal_range(v);
-                    std::for_each(byId.first, byId.second, [&] (const auto& v) { result.push_back(v.second); });
-                });
-
-            std::sort(result.begin(), result.end());
-
-            return result;
-        }
+        std::vector<OffMeshConnection> get(const TilePosition& tilePosition);
 
     private:
         struct Values
@@ -99,14 +35,6 @@ namespace DetourNavigator
 
         const Settings& mSettings;
         Misc::ScopeGuarded<Values> mValues;
-
-        void removeByTilePosition(std::map<TilePosition, std::unordered_set<ObjectId>>& valuesByTilePosition,
-            const TilePosition& tilePosition, const ObjectId id)
-        {
-            const auto it = valuesByTilePosition.find(tilePosition);
-            if (it != valuesByTilePosition.end())
-                it->second.erase(id);
-        }
     };
 }