diff --git a/.gitignore b/.gitignore
index 64ba00c..27ac7de 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,2 +1,3 @@
 win*
-build
\ No newline at end of file
+build
+.cppan
\ No newline at end of file
diff --git a/CMakeLists.txt b/CMakeLists.txt
index 313a684..ac15596 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -29,14 +29,7 @@ endif(MSVC)
 add_definitions(-DPOLYGON4_TOOLS=1)
 add_definitions(-DPOLYGON4_STATIC=1)
 
-if (NOT DATA_MANAGER_DIR)
-    message(FATAL_ERROR "DATA_MANAGER_DIR variable is not set!")
-else()
-    set(SOLUTION_FOLDER Extern)
-    add_subdirectory(${DATA_MANAGER_DIR} DataManager)
-    include_directories(${DATA_MANAGER_DIR}/include)
-    include_directories(${DATA_MANAGER_ADDITIONAL_INCLUDES})
-endif()
+add_subdirectory(.cppan)
 
 if (Git_FOUND)
     add_custom_target(version ALL
diff --git a/cppan.yml b/cppan.yml
new file mode 100644
index 0000000..58c8060
--- /dev/null
+++ b/cppan.yml
@@ -0,0 +1,6 @@
+local_settings:
+    dependencies:
+        #- name: pvt.lzwdgc.polygon4.data_manager
+        - name: data_manager
+          local: k:/AIM/DataManager
+
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 2faf368..f7ce326 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -11,11 +11,11 @@ endif()
 
 file(GLOB mmm_extractor_src "mmm_extractor/*")
 add_executable(mmm_extractor ${mmm_extractor_src})
-target_link_libraries(mmm_extractor DataManager common)
+target_link_libraries(mmm_extractor common data_manager)
 
 file(GLOB mmo_extractor_src "mmo_extractor/*")
 add_executable(mmo_extractor ${mmo_extractor_src})
-target_link_libraries(mmo_extractor DataManager common)
+target_link_libraries(mmo_extractor common data_manager)
 
 file(GLOB mmp_extractor_src "mmp_extractor/*")
 add_executable(mmp_extractor ${mmp_extractor_src})
diff --git a/src/save_loader/save.h b/src/save_loader/save.h
index bd2beee..0d20b35 100644
--- a/src/save_loader/save.h
+++ b/src/save_loader/save.h
@@ -562,7 +562,7 @@ struct mech_segment : public segment
             if (unk14 == 0)
                 return;
 
-            READ(b, unk15_1);
+            READ(b, unk15_1); // size?
 
             b.read_vector(equipments);