diff --git a/appveyor.yml b/appveyor.yml
index 7376c8a..af1fbfd 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -4,46 +4,45 @@ branches:
   only:
   - master
 
-image: Visual Studio 2017
+image: Visual Studio 2022
 
 clone_folder: c:\projects\php-ds
 
 environment:
-  PHP_SDK_BINARY_TOOLS_VER: php-sdk-2.1.1
+  PHP_SDK_BINARY_TOOLS_VER: php-sdk-2.6.0
 
   matrix:
     - ARCH: x86
       INT_SIZE: 32
       PHP_VER: 8.5
-      VC_VER: vc15
+      VC_VER: vs17
       ZTS: --enable-zts
     - ARCH: x64
       INT_SIZE: 64
       PHP_VER: 8.5
-      VC_VER: vc15
+      VC_VER: vs17
       ZTS: --enable-zts
     - ARCH: x86
       INT_SIZE: 32
       PHP_VER: 8.5
-      VC_VER: vc15
+      VC_VER: vs17
       ZTS: --disable-zts
     - ARCH: x64
       INT_SIZE: 64
       PHP_VER: 8.5
-      VC_VER: vc15
+      VC_VER: vs17
       ZTS: --disable-zts
 
 install:
 - cmd: choco feature enable -n=allowGlobalConfirmation
-- cmd: cinst wget
 - cmd: mkdir C:\projects\php-ds\bin
 - cmd: cd C:\projects\php-ds\bin && appveyor DownloadFile https://getcomposer.org/composer.phar
 
 build_script:
 - cmd: >-
-    "C:\Program Files (x86)\Microsoft Visual Studio\2017\Community\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
+    "C:\Program Files\Microsoft Visual Studio\2022\Community\VC\Auxiliary\Build\vcvarsall.bat" %ARCH%
 
-    wget https://github.com/OSTC/php-sdk-binary-tools/archive/%PHP_SDK_BINARY_TOOLS_VER%.zip --no-check-certificate -q -O php-sdk-binary-tools-%PHP_SDK_BINARY_TOOLS_VER%.zip
+    curl -L -o php-sdk-binary-tools-%PHP_SDK_BINARY_TOOLS_VER%.zip https://github.com/php/php-sdk-binary-tools/archive/refs/tags/%PHP_SDK_BINARY_TOOLS_VER%.zip
 
     7z x -y php-sdk-binary-tools-%PHP_SDK_BINARY_TOOLS_VER%.zip -oC:\projects
 
diff --git a/config.w32 b/config.w32
index da4c54a..ef02b6c 100644
--- a/config.w32
+++ b/config.w32
@@ -26,66 +26,49 @@ if (PHP_DS != "no") {
 
     ds_src("/ds",
     [
-        "ds_deque.c",
-        "ds_vector.c",
+        "ds_seq.c",
         "ds_htable.c",
         "ds_set.c",
         "ds_map.c",
-        "ds_stack.c",
-        "ds_priority_queue.c",
-        "ds_queue.c",
+        "ds_heap.c",
     ]);
 
     ds_src("/php/objects",
     [
-        "php_deque.c",
-        "php_vector.c",
+        "php_seq.c",
         "php_map.c",
         "php_pair.c",
-        "php_priority_queue.c",
+        "php_heap.c",
         "php_set.c",
-        "php_stack.c",
-        "php_queue.c",
     ]);
 
     ds_src("/php/iterators",
     [
-        "php_vector_iterator.c",
-        "php_deque_iterator.c",
+        "php_seq_iterator.c",
         "php_set_iterator.c",
         "php_map_iterator.c",
-        "php_stack_iterator.c",
         "php_htable_iterator.c",
-        "php_priority_queue_iterator.c",
-        "php_queue_iterator.c",
+        "php_heap_iterator.c",
     ]);
 
     ds_src("/php/handlers",
     [
         "php_common_handlers.c",
-        "php_vector_handlers.c",
-        "php_deque_handlers.c",
+        "php_seq_handlers.c",
         "php_set_handlers.c",
         "php_map_handlers.c",
-        "php_stack_handlers.c",
         "php_pair_handlers.c",
-        "php_priority_queue_handlers.c",
-        "php_queue_handlers.c",
+        "php_heap_handlers.c",
     ]);
 
     ds_src("/php/classes",
     [
-        "php_hashable_ce.c",
-        "php_collection_ce.c",
-        "php_sequence_ce.c",
-        "php_vector_ce.c",
-        "php_deque_ce.c",
+        "php_key_ce.c",
+        "php_seq_ce.c",
         "php_set_ce.c",
         "php_map_ce.c",
-        "php_stack_ce.c",
         "php_pair_ce.c",
-        "php_priority_queue_ce.c",
-        "php_queue_ce.c",
+        "php_heap_ce.c",
     ]);
 
     ADD_EXTENSION_DEP('ds', 'spl');