diff --git a/PhpStormStubsMap.php b/PhpStormStubsMap.php
index 04ecae0a6..d1fc25f87 100644
--- a/PhpStormStubsMap.php
+++ b/PhpStormStubsMap.php
@@ -710,7 +710,6 @@ final class PhpStormStubsMap
   'MongoDB\\Driver\\ClientEncryption' => 'mongodb/ClientEncryption.php',
   'MongoDB\\Driver\\Command' => 'mongodb/Command.php',
   'MongoDB\\Driver\\Cursor' => 'mongodb/Cursor.php',
-  'MongoDB\\Driver\\CursorId' => 'mongodb/CursorId.php',
   'MongoDB\\Driver\\CursorInterface' => 'mongodb/CursorInterface.php',
   'MongoDB\\Driver\\Exception\\AuthenticationException' => 'mongodb/Exception/AuthenticationException.php',
   'MongoDB\\Driver\\Exception\\BulkWriteException' => 'mongodb/Exception/BulkWriteException.php',
@@ -723,11 +722,9 @@ final class PhpStormStubsMap
   'MongoDB\\Driver\\Exception\\InvalidArgumentException' => 'mongodb/Exception/InvalidArgumentException.php',
   'MongoDB\\Driver\\Exception\\LogicException' => 'mongodb/Exception/LogicException.php',
   'MongoDB\\Driver\\Exception\\RuntimeException' => 'mongodb/Exception/RuntimeException.php',
-  'MongoDB\\Driver\\Exception\\SSLConnectionException' => 'mongodb/Exception/SSLConnectionException.php',
   'MongoDB\\Driver\\Exception\\ServerException' => 'mongodb/Exception/ServerException.php',
   'MongoDB\\Driver\\Exception\\UnexpectedValueException' => 'mongodb/Exception/UnexpectedValueException.php',
   'MongoDB\\Driver\\Exception\\WriteConcernException' => 'mongodb/Exception/WriteConcernException.php',
-  'MongoDB\\Driver\\Exception\\WriteException' => 'mongodb/Exception/WriteException.php',
   'MongoDB\\Driver\\Manager' => 'mongodb/Manager.php',
   'MongoDB\\Driver\\Monitoring\\CommandFailedEvent' => 'mongodb/Monitoring/CommandFailedEvent.php',
   'MongoDB\\Driver\\Monitoring\\CommandStartedEvent' => 'mongodb/Monitoring/CommandStartedEvent.php',
@@ -1466,12 +1463,6 @@ final class PhpStormStubsMap
   'GEOSRelateMatch' => 'geos/geos.php',
   'GEOSSharedPaths' => 'geos/geos.php',
   'GEOSVersion' => 'geos/geos.php',
-  'MongoDB\\BSON\\fromJSON' => 'mongodb/BSON/functions.php',
-  'MongoDB\\BSON\\fromPHP' => 'mongodb/BSON/functions.php',
-  'MongoDB\\BSON\\toCanonicalExtendedJSON' => 'mongodb/BSON/functions.php',
-  'MongoDB\\BSON\\toJSON' => 'mongodb/BSON/functions.php',
-  'MongoDB\\BSON\\toPHP' => 'mongodb/BSON/functions.php',
-  'MongoDB\\BSON\\toRelaxedExtendedJSON' => 'mongodb/BSON/functions.php',
   'MongoDB\\Driver\\Monitoring\\addSubscriber' => 'mongodb/Monitoring/functions.php',
   'MongoDB\\Driver\\Monitoring\\removeSubscriber' => 'mongodb/Monitoring/functions.php',
   'OpenTelemetry\\Instrumentation\\hook' => 'opentelemetry/opentelemetry.php',
diff --git a/meta/.phpstorm.meta.php b/meta/.phpstorm.meta.php
index 30ef2ed14..b63fffef6 100644
--- a/meta/.phpstorm.meta.php
+++ b/meta/.phpstorm.meta.php
@@ -236,7 +236,7 @@ function argumentsSet($setName) {
     expectedArguments(\MemcachePool::set(), 2, MEMCACHE_COMPRESSED);
     expectedArguments(\MemcachePool::replace(), 2, MEMCACHE_COMPRESSED);
 
-    expectedArguments(\MongoDB\Driver\ReadPreference::__construct(), 0, \MongoDB\Driver\ReadPreference::RP_PRIMARY,\MongoDB\Driver\ReadPreference::RP_PRIMARY_PREFERRED,\MongoDB\Driver\ReadPreference::RP_SECONDARY,\MongoDB\Driver\ReadPreference::RP_SECONDARY_PREFERRED,\MongoDB\Driver\ReadPreference::RP_NEAREST);
+    expectedArguments(\MongoDB\Driver\ReadPreference::__construct(), 0, \MongoDB\Driver\ReadPreference::PRIMARY,\MongoDB\Driver\ReadPreference::PRIMARY_PREFERRED,\MongoDB\Driver\ReadPreference::SECONDARY,\MongoDB\Driver\ReadPreference::SECONDARY_PREFERRED,\MongoDB\Driver\ReadPreference::NEAREST);
     expectedArguments(\mysqli::begin_transaction(), 0, MYSQLI_TRANS_START_READ_ONLY,MYSQLI_TRANS_START_READ_WRITE,MYSQLI_TRANS_START_WITH_CONSISTENT_SNAPSHOT);
     expectedArguments(\mysqli::commit(), 0, MYSQLI_TRANS_COR_AND_CHAIN|MYSQLI_TRANS_COR_AND_NO_CHAIN|MYSQLI_TRANS_COR_NO_RELEASE|MYSQLI_TRANS_COR_RELEASE);
     expectedArguments(\mysqli::real_connect(), 6, MYSQLI_CLIENT_COMPRESS|MYSQLI_CLIENT_FOUND_ROWS|MYSQLI_CLIENT_IGNORE_SPACE|MYSQLI_CLIENT_INTERACTIVE|MYSQLI_CLIENT_SSL|MYSQLI_CLIENT_SSL_DONT_VERIFY_SERVER_CERT);
diff --git a/mongodb/BSON/Binary.php b/mongodb/BSON/Binary.php
index 836e26655..4bf5a979a 100644
--- a/mongodb/BSON/Binary.php
+++ b/mongodb/BSON/Binary.php
@@ -4,13 +4,13 @@
 
 use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
+use Stringable;
 
 /**
  * Class Binary
  * @link https://php.net/manual/en/class.mongodb-bson-binary.php
  */
-final class Binary implements Type, BinaryInterface, \Serializable, JsonSerializable
+final class Binary implements Type, BinaryInterface, JsonSerializable, Stringable
 {
     public const TYPE_GENERIC = 0, TYPE_FUNCTION = 1;
     public const TYPE_OLD_BINARY = 2;
@@ -27,6 +27,11 @@ final class Binary implements Type, BinaryInterface, \Serializable, JsonSerializ
      * @since 1.12.0
      */
     public const TYPE_COLUMN = 7;
+
+    /**
+     * @since 1.17.0
+     */
+    public const TYPE_SENSITIVE = 8;
     public const TYPE_USER_DEFINED = 128;
 
     /**
@@ -47,7 +52,7 @@ final public function getData(): string {}
      */
     final public function getType(): int {}
 
-    public static function __set_state(array $properties) {}
+    public static function __set_state(array $properties): self {}
 
     /**
      * Returns the Binary's data
@@ -55,23 +60,6 @@ public static function __set_state(array $properties) {}
      */
     final public function __toString(): string {}
 
-    /**
-     * Serialize a Binary
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-binary.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a Binary
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-binary.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data) {}
-
     /**
      * Returns a representation that can be converted to JSON
      * @since 1.2.0
@@ -79,5 +67,5 @@ final public function unserialize(string $data) {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 }
diff --git a/mongodb/BSON/BinaryInterface.php b/mongodb/BSON/BinaryInterface.php
index ec804ab1d..237a89a56 100644
--- a/mongodb/BSON/BinaryInterface.php
+++ b/mongodb/BSON/BinaryInterface.php
@@ -12,18 +12,18 @@ interface BinaryInterface
      * @link https://www.php.net/manual/en/mongodb-bson-binaryinterface.getdata.php
      * @return string Returns the BinaryInterface's data
      */
-    public function getData();
+    public function getData(): string;
 
     /**
      * @link https://www.php.net/manual/en/mongodb-bson-binaryinterface.gettype.php
      * @return int Returns the BinaryInterface's type.
      */
-    public function getType();
+    public function getType(): int;
 
     /**
      * This method is an alias of: MongoDB\BSON\BinaryInterface::getData().
      * @link https://www.php.net/manual/en/mongodb-bson-binaryinterface.tostring.php
      * @return string Returns the BinaryInterface's data.
      */
-    public function __toString();
+    public function __toString(): string;
 }
diff --git a/mongodb/BSON/DBPointer.php b/mongodb/BSON/DBPointer.php
index d383ecbbb..bbaa719f5 100644
--- a/mongodb/BSON/DBPointer.php
+++ b/mongodb/BSON/DBPointer.php
@@ -3,8 +3,9 @@
 namespace MongoDB\BSON;
 
 use JetBrains\PhpStorm\Deprecated;
+use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
+use Stringable;
 
 /**
  * BSON type for the "DbPointer" type. This BSON type is deprecated, and this class can not be instantiated. It will be created from a
@@ -14,32 +15,10 @@
  * @link https://secure.php.net/manual/en/class.mongodb-bson-dbpointer.php
  */
 #[Deprecated]
-final class DBPointer implements Type, \Serializable, \JsonSerializable
+final class DBPointer implements Type, JsonSerializable, Stringable
 {
     final private function __construct() {}
 
-    /**
-     * Serialize a DBPointer
-     *
-     * @link https://www.php.net/manual/en/mongodb-bson-dbpointer.serialize.php
-     * @return string
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a DBPointer
-     *
-     * @link https://www.php.net/manual/en/mongodb-bson-dbpointer.unserialize.php
-     *
-     * @param string $serialized
-     *
-     * @return void
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
-
     /**
      * Returns a representation that can be converted to JSON
      *
@@ -47,7 +26,7 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 
     /**
      * Returns the Symbol as a string
diff --git a/mongodb/BSON/Decimal128.php b/mongodb/BSON/Decimal128.php
index 5936979d8..e3f117655 100644
--- a/mongodb/BSON/Decimal128.php
+++ b/mongodb/BSON/Decimal128.php
@@ -4,13 +4,13 @@
 
 use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
+use Stringable;
 
 /**
  * BSON type for the Decimal128 floating-point format, which supports numbers with up to 34 decimal digits (i.e. significant digits) and an exponent range of −6143 to +6144.
  * @link https://php.net/manual/en/class.mongodb-bson-decimal128.php
  */
-final class Decimal128 implements Type, Decimal128Interface, \Serializable, JsonSerializable
+final class Decimal128 implements Type, Decimal128Interface, JsonSerializable, Stringable
 {
     /**
      * Construct a new Decimal128
@@ -25,25 +25,7 @@ final public function __construct(string $value = '') {}
      */
     final public function __toString(): string {}
 
-    public static function __set_state(array $properties) {}
-
-    /**
-     * Serialize a Decimal128
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-decimal128.serialize.php
-     * @return string
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a Decimal128
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-decimal128.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
+    public static function __set_state(array $properties): self {}
 
     /**
      * Returns a representation that can be converted to JSON
@@ -52,5 +34,5 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 }
diff --git a/mongodb/BSON/Decimal128Interface.php b/mongodb/BSON/Decimal128Interface.php
index 6741439fd..a128815cb 100644
--- a/mongodb/BSON/Decimal128Interface.php
+++ b/mongodb/BSON/Decimal128Interface.php
@@ -13,5 +13,5 @@ interface Decimal128Interface
      * @link https://www.php.net/manual/en/mongodb-bson-decimal128interface.tostring.php
      * @return string Returns the string representation of this Decimal128Interface
      */
-    public function __toString();
+    public function __toString(): string;
 }
diff --git a/mongodb/BSON/Document.php b/mongodb/BSON/Document.php
index 13a3ae0da..d19a91af6 100644
--- a/mongodb/BSON/Document.php
+++ b/mongodb/BSON/Document.php
@@ -2,11 +2,15 @@
 
 namespace MongoDB\BSON;
 
+use ArrayAccess;
+use IteratorAggregate;
+use Stringable;
+
 /**
  * @since 1.16.0
  * @link https://secure.php.net/manual/en/class.mongodb-bson-document.php
  */
-final class Document implements \ArrayAccess, \IteratorAggregate, \Serializable
+final class Document implements IteratorAggregate, ArrayAccess, Type, Stringable
 {
     private function __construct() {}
 
@@ -44,10 +48,6 @@ final public function __toString(): string {}
 
     final public static function __set_state(array $properties): Document {}
 
-    final public function serialize(): string {}
-
-    final public function unserialize(string $data): void {}
-
     final public function __unserialize(array $data): void {}
 
     final public function __serialize(): array {}
diff --git a/mongodb/BSON/Int64.php b/mongodb/BSON/Int64.php
index ba2145f17..45eff1311 100644
--- a/mongodb/BSON/Int64.php
+++ b/mongodb/BSON/Int64.php
@@ -2,8 +2,9 @@
 
 namespace MongoDB\BSON;
 
+use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
+use Stringable;
 
 /**
  * BSON type for a 64-bit integer.
@@ -11,27 +12,12 @@
  * @since 1.5.0
  * @link https://secure.php.net/manual/en/class.mongodb-bson-int64.php
  */
-final class Int64 implements Type, \Serializable, \JsonSerializable
+final class Int64 implements Type, JsonSerializable, Stringable
 {
     /** @since 1.16.0 */
     final public function __construct(string|int $value) {}
 
-    /**
-     * Serialize an Int64
-     * @link https://www.php.net/manual/en/mongodb-bson-int64.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    public static function __set_state(array $properties) {}
-
-    /**
-     * Unserialize an Int64
-     * @link https://www.php.net/manual/en/mongodb-bson-int64.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
+    public static function __set_state(array $properties): self {}
 
     /**
      * Returns a representation that can be converted to JSON
@@ -39,7 +25,7 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 
     /**
      * Returns the Symbol as a string
diff --git a/mongodb/BSON/Javascript.php b/mongodb/BSON/Javascript.php
index 6201b7df8..c429909ee 100644
--- a/mongodb/BSON/Javascript.php
+++ b/mongodb/BSON/Javascript.php
@@ -4,13 +4,13 @@
 
 use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
+use Stringable;
 
 /**
  * Class Javascript
  * @link https://php.net/manual/en/class.mongodb-bson-javascript.php
  */
-final class Javascript implements Type, JavascriptInterface, \Serializable, JsonSerializable
+final class Javascript implements Type, JavascriptInterface, JsonSerializable, Stringable
 {
     /**
      * Construct a new Javascript
@@ -18,7 +18,7 @@ final class Javascript implements Type, JavascriptInterface, \Serializable, Json
      */
     final public function __construct(string $javascript, array|object|null $scope = null) {}
 
-    public static function __set_state(array $properties) {}
+    public static function __set_state(array $properties): self {}
 
     /**
      * Returns the Javascript's code
@@ -38,23 +38,6 @@ final public function getScope(): ?object {}
      */
     final public function __toString(): string {}
 
-    /**
-     * Serialize a Javascript
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-javascript.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a Javascript
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-javascript.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
-
     /**
      * Returns a representation that can be converted to JSON
      * @since 1.2.0
@@ -62,5 +45,5 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 }
diff --git a/mongodb/BSON/JavascriptInterface.php b/mongodb/BSON/JavascriptInterface.php
index 43d95ead6..7f7409a47 100644
--- a/mongodb/BSON/JavascriptInterface.php
+++ b/mongodb/BSON/JavascriptInterface.php
@@ -16,7 +16,7 @@ interface JavascriptInterface
      * @link https://secure.php.net/manual/en/mongodb-bson-javascriptinterface.getcode.php
      * @since 1.3.0
      */
-    public function getCode();
+    public function getCode(): string;
 
     /**
      * Returns the JavascriptInterface's scope document
@@ -24,7 +24,7 @@ public function getCode();
      * @link https://secure.php.net/manual/en/mongodb-bson-javascriptinterface.getscope.php
      * @since 1.3.0
      */
-    public function getScope();
+    public function getScope(): ?object;
 
     /**
      * Returns the JavascriptInterface's code
@@ -32,5 +32,5 @@ public function getScope();
      * @link https://secure.php.net/manual/en/mongodb-bson-javascriptinterface.tostring.php
      * @since 1.3.0
      */
-    public function __toString();
+    public function __toString(): string;
 }
diff --git a/mongodb/BSON/MaxKey.php b/mongodb/BSON/MaxKey.php
index c9c65927a..f463243c1 100644
--- a/mongodb/BSON/MaxKey.php
+++ b/mongodb/BSON/MaxKey.php
@@ -4,32 +4,14 @@
 
 use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
 
 /**
  * Class MaxKey
  * @link https://php.net/manual/en/class.mongodb-bson-maxkey.php
  */
-final class MaxKey implements Type, MaxKeyInterface, \Serializable, JsonSerializable
+final class MaxKey implements Type, MaxKeyInterface, JsonSerializable
 {
-    public static function __set_state(array $properties) {}
-
-    /**
-     * Serialize a MaxKey
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-maxkey.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a MaxKey
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-maxkey.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
+    public static function __set_state(array $properties): self {}
 
     /**
      * Returns a representation that can be converted to JSON
@@ -38,5 +20,5 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 }
diff --git a/mongodb/BSON/MinKey.php b/mongodb/BSON/MinKey.php
index c09e3846e..80d380c14 100644
--- a/mongodb/BSON/MinKey.php
+++ b/mongodb/BSON/MinKey.php
@@ -4,32 +4,14 @@
 
 use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
 
 /**
  * Class MinKey
  * @link https://php.net/manual/en/class.mongodb-bson-minkey.php
  */
-final class MinKey implements Type, MinKeyInterface, \Serializable, JsonSerializable
+final class MinKey implements Type, MinKeyInterface, JsonSerializable
 {
-    public static function __set_state(array $properties) {}
-
-    /**
-     * Serialize a MinKey
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-minkey.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a MinKey
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-minkey.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
+    public static function __set_state(array $properties): self {}
 
     /**
      * Returns a representation that can be converted to JSON
@@ -38,5 +20,5 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 }
diff --git a/mongodb/BSON/ObjectId.php b/mongodb/BSON/ObjectId.php
index 44d45301f..84d8c3af4 100644
--- a/mongodb/BSON/ObjectId.php
+++ b/mongodb/BSON/ObjectId.php
@@ -4,12 +4,13 @@
 
 use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
+use Stringable;
 
 /**
  * Class ObjectId
  * @link https://php.net/manual/en/class.mongodb-bson-objectid.php
  */
-final class ObjectId implements Type, ObjectIdInterface, \Serializable, JsonSerializable
+final class ObjectId implements Type, ObjectIdInterface, JsonSerializable, Stringable
 {
     /**
      * Construct a new ObjectId
@@ -25,7 +26,7 @@ final public function __construct(?string $id = null) {}
      */
     final public function __toString(): string {}
 
-    public static function __set_state(array $properties) {}
+    public static function __set_state(array $properties): self {}
 
     /**
      * Returns the timestamp component of this ObjectId
@@ -41,19 +42,5 @@ final public function getTimestamp(): int {}
      * @link https://secure.php.net/manual/en/mongodb-bson-objectid.jsonserialize.php
      * @return mixed data which can be serialized by json_encode()
      */
-    final public function jsonSerialize() {}
-
-    /**
-     * Serialize an ObjectId
-     * @since 1.2.0
-     * @link https://secure.php.net/manual/en/mongodb-bson-objectid.serialize.php
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize an ObjectId
-     * @since 1.2.0
-     * @link https://secure.php.net/manual/en/mongodb-bson-objectid.unserialize.php
-     */
-    final public function unserialize(string $data): void {}
+    final public function jsonSerialize(): mixed {}
 }
diff --git a/mongodb/BSON/ObjectIdInterface.php b/mongodb/BSON/ObjectIdInterface.php
index 7ed44afe0..6bf76e999 100644
--- a/mongodb/BSON/ObjectIdInterface.php
+++ b/mongodb/BSON/ObjectIdInterface.php
@@ -12,12 +12,12 @@ interface ObjectIdInterface
      * @link https://www.php.net/manual/en/mongodb-bson-objectidinterface.gettimestamp.php
      * @return int Returns the timestamp component of this ObjectIdInterface.
      */
-    public function getTimestamp();
+    public function getTimestamp(): int;
 
     /**
      * Returns the hexadecimal representation of this ObjectId
      * @link https://www.php.net/manual/en/mongodb-bson-objectid.tostring.php
      * @return string Returns the hexadecimal representation of this ObjectId
      */
-    public function __toString();
+    public function __toString(): string;
 }
diff --git a/mongodb/BSON/PackedArray.php b/mongodb/BSON/PackedArray.php
index af3c1377f..e161048d3 100644
--- a/mongodb/BSON/PackedArray.php
+++ b/mongodb/BSON/PackedArray.php
@@ -2,11 +2,15 @@
 
 namespace MongoDB\BSON;
 
+use ArrayAccess;
+use IteratorAggregate;
+use Stringable;
+
 /**
  * @since 1.16.0
  * @link https://secure.php.net/manual/en/class.mongodb-bson-packedarray.php
  */
-final class PackedArray implements \ArrayAccess, \IteratorAggregate, \Serializable
+final class PackedArray implements IteratorAggregate, ArrayAccess, Type, Stringable
 {
     private function __construct() {}
 
@@ -45,10 +49,6 @@ final public function __toString(): string {}
 
     final public static function __set_state(array $properties): PackedArray {}
 
-    final public function serialize(): string {}
-
-    final public function unserialize(string $data): void {}
-
     final public function __unserialize(array $data): void {}
 
     final public function __serialize(): array {}
diff --git a/mongodb/BSON/Regex.php b/mongodb/BSON/Regex.php
index 47ae2060f..11be1386a 100644
--- a/mongodb/BSON/Regex.php
+++ b/mongodb/BSON/Regex.php
@@ -4,13 +4,13 @@
 
 use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
+use Stringable;
 
 /**
  * Class Regex
  * @link https://php.net/manual/en/class.mongodb-bson-regex.php
  */
-final class Regex implements Type, RegexInterface, \Serializable, JsonSerializable
+final class Regex implements RegexInterface, JsonSerializable, Type, Stringable
 {
     /**
      * Construct a new Regex
@@ -36,24 +36,7 @@ final public function getPattern(): string {}
      */
     final public function __toString(): string {}
 
-    public static function __set_state(array $properties) {}
-
-    /**
-     * Serialize a Regex
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-regex.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a Regex
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-regex.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
+    public static function __set_state(array $properties): self {}
 
     /**
      * Returns a representation that can be converted to JSON
@@ -62,5 +45,5 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 }
diff --git a/mongodb/BSON/RegexInterface.php b/mongodb/BSON/RegexInterface.php
index de6cf6d34..086bfe493 100644
--- a/mongodb/BSON/RegexInterface.php
+++ b/mongodb/BSON/RegexInterface.php
@@ -12,18 +12,18 @@ interface RegexInterface
      * @link https://www.php.net/manual/en/mongodb-bson-regexinterface.getflags.php
      * @return string Returns the RegexInterface's flags.
      */
-    public function getFlags();
+    public function getFlags(): string;
 
     /**
      * @link https://www.php.net/manual/en/mongodb-bson-regexinterface.getpattern.php
      * @return string Returns the RegexInterface's pattern.
      */
-    public function getPattern();
+    public function getPattern(): string;
 
     /**
      * Returns the string representation of this RegexInterface
      * @link https://www.php.net/manual/en/mongodb-bson-regexinterface.tostring.php
      * @return string
      */
-    public function __toString();
+    public function __toString(): string;
 }
diff --git a/mongodb/BSON/Symbol.php b/mongodb/BSON/Symbol.php
index a49cb54e4..a9fbb1b03 100644
--- a/mongodb/BSON/Symbol.php
+++ b/mongodb/BSON/Symbol.php
@@ -3,8 +3,9 @@
 namespace MongoDB\BSON;
 
 use JetBrains\PhpStorm\Deprecated;
+use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
+use Stringable;
 
 /**
  * BSON type for the "Symbol" type. This BSON type is deprecated, and this class can not be instantiated. It will be created from a
@@ -13,27 +14,10 @@
  * @link https://secure.php.net/manual/en/class.mongodb-bson-symbol.php
  */
 #[Deprecated]
-final class Symbol implements Type, \Serializable, \JsonSerializable
+final class Symbol implements JsonSerializable, Type, Stringable
 {
     final private function __construct() {}
 
-    /**
-     * Serialize a Symbol
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-symbol.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a Symbol
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-symbol.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
-
     /**
      * Returns a representation that can be converted to JSON
      * @since 1.2.0
@@ -41,7 +25,7 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 
     /**
      * Returns the Symbol as a string
diff --git a/mongodb/BSON/Timestamp.php b/mongodb/BSON/Timestamp.php
index 47263fee3..55c2579bb 100644
--- a/mongodb/BSON/Timestamp.php
+++ b/mongodb/BSON/Timestamp.php
@@ -4,13 +4,13 @@
 
 use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
+use Stringable;
 
 /**
  * Represents a BSON timestamp, which is an internal MongoDB type not intended for general date storage.
  * @link https://php.net/manual/en/class.mongodb-bson-timestamp.php
  */
-final class Timestamp implements TimestampInterface, Type, \Serializable, JsonSerializable
+final class Timestamp implements TimestampInterface, JsonSerializable, Type, Stringable
 {
     /**
      * Construct a new Timestamp
@@ -24,7 +24,7 @@ final public function __construct(int $increment, int $timestamp) {}
      */
     final public function __toString(): string {}
 
-    public static function __set_state(array $properties) {}
+    public static function __set_state(array $properties): self {}
 
     /**
      * Returns the increment component of this TimestampInterface
@@ -40,23 +40,6 @@ final public function getIncrement(): int {}
      */
     final public function getTimestamp(): int {}
 
-    /**
-     * Serialize a Timestamp
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-timestamp.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a Timestamp
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-timestamp.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
-
     /**
      * Returns a representation that can be converted to JSON
      * @since 1.2.0
@@ -64,5 +47,5 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 }
diff --git a/mongodb/BSON/TimestampInterface.php b/mongodb/BSON/TimestampInterface.php
index 85dfa7c10..e4ca522ed 100644
--- a/mongodb/BSON/TimestampInterface.php
+++ b/mongodb/BSON/TimestampInterface.php
@@ -16,7 +16,7 @@ interface TimestampInterface
      * @return int
      * @since 1.3.0
      */
-    public function getIncrement();
+    public function getIncrement(): int;
 
     /**
      * Returns the timestamp component of this TimestampInterface
@@ -24,7 +24,7 @@ public function getIncrement();
      * @return int
      * @since 1.3.0
      */
-    public function getTimestamp();
+    public function getTimestamp(): int;
 
     /**
      * Returns the string representation of this TimestampInterface
@@ -32,5 +32,5 @@ public function getTimestamp();
      * @return string
      * @since 1.3.0
      */
-    public function __toString();
+    public function __toString(): string;
 }
diff --git a/mongodb/BSON/UTCDateTime.php b/mongodb/BSON/UTCDateTime.php
index 81a4d16a2..88ed17712 100644
--- a/mongodb/BSON/UTCDateTime.php
+++ b/mongodb/BSON/UTCDateTime.php
@@ -3,22 +3,23 @@
 namespace MongoDB\BSON;
 
 use DateTimeInterface;
+use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
+use Stringable;
 
 /**
  * Represents a BSON date.
  * @link https://php.net/manual/en/class.mongodb-bson-utcdatetime.php
  */
-final class UTCDateTime implements Type, UTCDateTimeInterface, \Serializable, \JsonSerializable
+final class UTCDateTime implements UTCDateTimeInterface, JsonSerializable, Type, Stringable
 {
     /**
      * Construct a new UTCDateTime
      * @link https://php.net/manual/en/mongodb-bson-utcdatetime.construct.php
      */
-    final public function __construct(int|string|float|DateTimeInterface|Int64|null $milliseconds = null) {}
+    final public function __construct(int|DateTimeInterface|Int64|null $milliseconds = null) {}
 
-    public static function __set_state(array $properties) {}
+    public static function __set_state(array $properties): self {}
 
     /**
      * Returns the DateTime representation of this UTCDateTime
@@ -39,23 +40,6 @@ final public function toDateTimeImmutable(): \DateTimeImmutable {}
      */
     final public function __toString(): string {}
 
-    /**
-     * Serialize a UTCDateTime
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-utcdatetime.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a UTCDateTime
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-utcdatetime.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
-
     /**
      * Returns a representation that can be converted to JSON
      * @since 1.2.0
@@ -63,5 +47,5 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 }
diff --git a/mongodb/BSON/UTCDateTimeInterface.php b/mongodb/BSON/UTCDateTimeInterface.php
index 09f4027eb..55bf2701f 100644
--- a/mongodb/BSON/UTCDateTimeInterface.php
+++ b/mongodb/BSON/UTCDateTimeInterface.php
@@ -3,6 +3,7 @@
 namespace MongoDB\BSON;
 
 use DateTime;
+use DateTimeImmutable;
 
 /**
  * This interface is implemented by MongoDB\BSON\UTCDateTime but may also be used for type-hinting and userland classes.
@@ -12,14 +13,20 @@ interface UTCDateTimeInterface
 {
     /**
      * @link https://www.php.net/manual/en/mongodb-bson-utcdatetimeinterface.todatetime.php
-     * @return DateTime Returns the DateTime representation of this UTCDateTimeInterface. The returned DateTime should use the UTC time zone.
+     * @return DateTime Returns the DateTime representation of this UTCDateTimeInterface. The returned DateTime uses the UTC time zone.
      */
-    public function toDateTime();
+    public function toDateTime(): DateTime;
+
+    /**
+     * @link https://www.php.net/manual/en/mongodb-bson-utcdatetimeinterface.todatetimeimmutable.php
+     * @return DateTimeImmutable Returns the DateTimeImmutable representation of this UTCDateTimeInterface. The returned DateTime uses the UTC time zone.
+     */
+    public function toDateTimeImmutable(): DateTimeImmutable;
 
     /**
      * Returns the string representation of this UTCDateTimeInterface
      * @link https://www.php.net/manual/en/mongodb-bson-utcdatetimeinterface.tostring.php
      * @return string
      */
-    public function __toString();
+    public function __toString(): string;
 }
diff --git a/mongodb/BSON/Undefined.php b/mongodb/BSON/Undefined.php
index 9b69ad691..0e0f07ac6 100644
--- a/mongodb/BSON/Undefined.php
+++ b/mongodb/BSON/Undefined.php
@@ -3,8 +3,9 @@
 namespace MongoDB\BSON;
 
 use JetBrains\PhpStorm\Deprecated;
+use JsonSerializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
+use Stringable;
 
 /**
  * BSON type for the "Undefined" type. This BSON type is deprecated, and this class can not be instantiated. It will be created
@@ -13,27 +14,10 @@
  * @link https://secure.php.net/manual/en/class.mongodb-bson-undefined.php
  */
 #[Deprecated]
-final class Undefined implements Type, \Serializable, \JsonSerializable
+final class Undefined implements JsonSerializable, Type, Stringable
 {
     final private function __construct() {}
 
-    /**
-     * Serialize an Undefined
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-undefined.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize an Undefined
-     * @since 1.2.0
-     * @link https://www.php.net/manual/en/mongodb-bson-undefined.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
-
     /**
      * Returns a representation that can be converted to JSON
      * @since 1.2.0
@@ -41,7 +25,7 @@ final public function unserialize(string $data): void {}
      * @return mixed data which can be serialized by json_encode()
      * @throws InvalidArgumentException on argument parsing errors
      */
-    final public function jsonSerialize() {}
+    final public function jsonSerialize(): mixed {}
 
     /**
      * Returns the Undefined as a string
diff --git a/mongodb/BSON/Unserializable.php b/mongodb/BSON/Unserializable.php
index 1dc8f3e9f..c0b885e23 100644
--- a/mongodb/BSON/Unserializable.php
+++ b/mongodb/BSON/Unserializable.php
@@ -15,5 +15,5 @@ interface Unserializable extends Type
      * @link https://php.net/manual/en/mongodb-bson-unserializable.bsonunserialize.php
      * @param array $data Properties within the BSON array or document.
      */
-    public function bsonUnserialize(array $data);
+    public function bsonUnserialize(array $data): void;
 }
diff --git a/mongodb/BSON/functions.php b/mongodb/BSON/functions.php
deleted file mode 100644
index 9792b36ee..000000000
--- a/mongodb/BSON/functions.php
+++ /dev/null
@@ -1,79 +0,0 @@
-<?php
-
-namespace MongoDB\BSON;
-
-use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
-
-/**
- * Converts a BSON string to its Canonical Extended JSON representation.
- * The canonical format prefers type fidelity at the expense of concise output and is most suited for producing
- * output that can be converted back to BSON without any loss of type information
- * (e.g. numeric types will remain differentiated).
- * @link https://www.php.net/manual/en/function.mongodb.bson-tocanonicalextendedjson.php
- * @param string $bson BSON value to be converted
- * @return string The converted JSON value
- * @throws UnexpectedValueException
- * @deprecated Use MongoDB\BSON\Document instead
- */
-function toCanonicalExtendedJSON($bson) {}
-
-/**
- * Converts a BSON string to its » Relaxed Extended JSON representation.
- * The relaxed format prefers use of JSON type primitives at the expense of type fidelity and is most suited for
- * producing output that can be easily consumed by web APIs and humans.
- * @link https://www.php.net/manual/en/function.mongodb.bson-torelaxedextendedjson.php
- * @param string $bson BSON value to be converted
- * @return string The converted JSON value
- * @throws UnexpectedValueException
- * @deprecated Use MongoDB\BSON\Document instead
- */
-function toRelaxedExtendedJSON($bson) {}
-
-/**
- * Returns the BSON representation of a JSON value
- * Converts an extended JSON string to its BSON representation.
- * @link https://php.net/manual/en/function.mongodb.bson-fromjson.php
- * @param string $json JSON value to be converted.
- * @return string The serialized BSON document as a binary string.
- * @throws UnexpectedValueException if the JSON value cannot be converted to BSON (e.g. due to a syntax error).
- * @deprecated Use MongoDB\BSON\Document instead
- */
-function fromJSON($json) {}
-
-/**
- * Returns the BSON representation of a PHP value
- * Serializes a PHP array or object (e.g. document) to its BSON representation. The returned binary string will describe a BSON document.
- * @link https://php.net/manual/en/function.mongodb.bson-fromphp.php
- * @param array|object $value PHP value to be serialized.
- * @return string The serialized BSON document as a binary string
- * @throws UnexpectedValueException if the PHP value cannot be converted to BSON.
- * @deprecated Use MongoDB\BSON\Document instead
- */
-function fromPHP($value) {}
-
-/**
- * Returns the JSON representation of a BSON value
- * Converts a BSON string to its extended JSON representation.
- * @link https://php.net/manual/en/function.mongodb.bson-tojson.php
- * @param string $bson BSON value to be converted
- * @return string The converted JSON value.
- * @see https://docs.mongodb.org/manual/reference/mongodb-extended-json/
- * @throws UnexpectedValueException if the input did not contain exactly one BSON document
- * @deprecated Use MongoDB\BSON\Document instead
- */
-function toJSON($bson) {}
-
-/**
- * Returns the PHP representation of a BSON value
- * Unserializes a BSON document (i.e. binary string) to its PHP representation.
- * The typeMap parameter may be used to control the PHP types used for converting BSON arrays and documents (both root and embedded).
- * @link https://php.net/manual/en/function.mongodb.bson-tophp.php
- * @param string $bson BSON value to be unserialized.
- * @param array $typemap
- * @return object The unserialized PHP value
- * @throws UnexpectedValueException if the input did not contain exactly one BSON document.
- * @throws InvalidArgumentException if a class in the type map cannot be instantiated or does not implement MongoDB\BSON\Unserializable.
- * @deprecated Use MongoDB\BSON\Document instead
- */
-function toPHP($bson, array $typemap = []) {}
diff --git a/mongodb/ClientEncryption.php b/mongodb/ClientEncryption.php
index c2901a729..4e0d12f33 100644
--- a/mongodb/ClientEncryption.php
+++ b/mongodb/ClientEncryption.php
@@ -31,12 +31,6 @@ final class ClientEncryption
      */
     public const ALGORITHM_RANGE = 'Range';
 
-    /**
-     * @since 1.16.0
-     * @deprecated
-     */
-    public const ALGORITHM_RANGE_PREVIEW = 'RangePreview';
-
     /**
      * @since 1.14.0
      */
@@ -47,12 +41,6 @@ final class ClientEncryption
      */
     public const QUERY_TYPE_RANGE = 'range';
 
-    /**
-     * @since 1.16.0
-     * @deprecated
-     */
-    public const QUERY_TYPE_RANGE_PREVIEW = 'rangePreview';
-
     /**
      * @since 1.14.0
      */
diff --git a/mongodb/Cursor.php b/mongodb/Cursor.php
index 14d199015..2a8186e7d 100644
--- a/mongodb/Cursor.php
+++ b/mongodb/Cursor.php
@@ -9,7 +9,7 @@
  * The MongoDB\Driver\Cursor class encapsulates the results of a MongoDB command or query and may be returned by MongoDB\Driver\Manager::executeCommand() or MongoDB\Driver\Manager::executeQuery(), respectively.
  * @link https://php.net/manual/en/class.mongodb-driver-cursor.php
  */
-final class Cursor implements CursorInterface, \Iterator
+final class Cursor implements CursorInterface
 {
     /**
      * Create a new Cursor
@@ -28,13 +28,11 @@ public function current(): array|object|null {}
 
     /**
      * Returns the cursor ID associated with this cursor. A cursor ID cursor uniquely identifies the cursor on the server.
-     * Receiving a CursorId return type is deprecated and will be removed in 2.0.
      *
-     * @param bool $asInt64 Pass true to receive the cursor as a MongoDB\BSON\Int64 instance
      * @link https://php.net/manual/en/mongodb-driver-cursor.getid.php
      * @throws InvalidArgumentException on argument parsing errors.
      */
-    final public function getId(bool $asInt64 = false): CursorId|Int64 {}
+    final public function getId(): Int64 {}
 
     /**
      * Returns the MongoDB\Driver\Server associated with this cursor. This is the server that executed the query or command.
diff --git a/mongodb/CursorId.php b/mongodb/CursorId.php
deleted file mode 100644
index ed8041735..000000000
--- a/mongodb/CursorId.php
+++ /dev/null
@@ -1,50 +0,0 @@
-<?php
-
-namespace MongoDB\Driver;
-
-use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
-
-/**
- * Class CursorId
- * @link https://php.net/manual/en/class.mongodb-driver-cursorid.php
- */
-final class CursorId implements \Serializable
-{
-    /**
-     * Create a new CursorId (not used)
-     * CursorId objects are returned from Cursor::getId() and cannot be constructed directly.
-     * @link https://php.net/manual/en/mongodb-driver-cursorid.construct.php
-     * @see Cursor::getId()
-     */
-    final private function __construct() {}
-
-    /**
-     * String representation of the cursor ID
-     * @link https://php.net/manual/en/mongodb-driver-cursorid.tostring.php
-     * @return string representation of the cursor ID.
-     * @throws InvalidArgumentException on argument parsing errors.
-     */
-    final public function __toString(): string {}
-
-    final public function __wakeup() {}
-
-    public static function __set_state(array $properties) {}
-
-    /**
-     * Serialize a CursorId
-     * @since 1.7.0
-     * @link https://php.net/manual/en/mongodb-driver-cursorid.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a CursorId
-     * @since 1.7.0
-     * @link https://php.net/manual/en/mongodb-driver-cursorid.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
-}
diff --git a/mongodb/CursorInterface.php b/mongodb/CursorInterface.php
index 8ac028627..1df00609d 100644
--- a/mongodb/CursorInterface.php
+++ b/mongodb/CursorInterface.php
@@ -2,24 +2,26 @@
 
 namespace MongoDB\Driver;
 
+use Iterator;
 use MongoDB\BSON\Int64;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use Traversable;
 
 /**
  * This interface is implemented by MongoDB\Driver\Cursor but may also be used for type-hinting and userland classes.
  * @link https://www.php.net/manual/en/class.mongodb-driver-cursorinterface.php
  * @since 1.6.0
  */
-interface CursorInterface extends Traversable
+interface CursorInterface extends Iterator
 {
+    public function current(): array|object|null;
+
     /**
      * Returns the cursor ID associated with this cursor. A cursor ID uniquely identifies the cursor on the server.
-     * @return CursorId|Int64 Returns the cursor ID for this cursor.
+     * @return Int64 Returns the cursor ID for this cursor.
      * @throws InvalidArgumentException
      * @link https://www.php.net/manual/en/mongodb-driver-cursorinterface.getid.php
      */
-    public function getId(): CursorId|Int64;
+    public function getId(): Int64;
 
     /**
      * Returns the MongoDB\Driver\Server associated with this cursor.
@@ -38,6 +40,8 @@ public function getServer(): Server;
      */
     public function isDead(): bool;
 
+    public function key(): ?int;
+
     /**
      * Sets a type map to use for BSON unserialization
      * @link https://www.php.net/manual/en/mongodb-driver-cursorinterface.settypemap.php
diff --git a/mongodb/Exception/BulkWriteException.php b/mongodb/Exception/BulkWriteException.php
index b5ed7983e..96c9d96bb 100644
--- a/mongodb/Exception/BulkWriteException.php
+++ b/mongodb/Exception/BulkWriteException.php
@@ -2,9 +2,23 @@
 
 namespace MongoDB\Driver\Exception;
 
+use MongoDB\Driver\WriteResult;
+
 /**
  * Thrown when a bulk write operation fails.
  * @link https://php.net/manual/en/class.mongodb-driver-exception-bulkwriteexception.php
  * @since 1.0.0
  */
-class BulkWriteException extends WriteException implements Exception {}
+class BulkWriteException extends ServerException implements Exception
+{
+    /**
+     * @var WriteResult associated with the failed write operation.
+     */
+    protected $writeResult;
+
+    /**
+     * @return WriteResult for the failed write operation
+     * @since 1.0.0
+     */
+    final public function getWriteResult(): WriteResult {}
+}
diff --git a/mongodb/Exception/SSLConnectionException.php b/mongodb/Exception/SSLConnectionException.php
deleted file mode 100644
index e38cb4b99..000000000
--- a/mongodb/Exception/SSLConnectionException.php
+++ /dev/null
@@ -1,10 +0,0 @@
-<?php
-
-namespace MongoDB\Driver\Exception;
-
-/**
- * Thrown when the driver fails to establish an SSL connection with the server.
- * @link https://php.net/manual/en/class.mongodb-driver-exception-sslconnectionexception.php
- * @deprecated use ConnectionException instead
- */
-class SSLConnectionException extends ConnectionException implements Exception {}
diff --git a/mongodb/Exception/WriteException.php b/mongodb/Exception/WriteException.php
deleted file mode 100644
index 2776ac13f..000000000
--- a/mongodb/Exception/WriteException.php
+++ /dev/null
@@ -1,26 +0,0 @@
-<?php
-
-namespace MongoDB\Driver\Exception;
-
-use MongoDB\Driver\WriteResult;
-
-/**
- * Base class for exceptions thrown by a failed write operation.
- * The exception encapsulates a MongoDB\Driver\WriteResult object.
- * @link https://php.net/manual/en/class.mongodb-driver-exception-writeexception.php
- * @since 1.0.0
- * @deprecated use MongoDB\Driver\Exception\BulkWriteException instead
- */
-abstract class WriteException extends ServerException implements Exception
-{
-    /**
-     * @var WriteResult associated with the failed write operation.
-     */
-    protected $writeResult;
-
-    /**
-     * @return WriteResult for the failed write operation
-     * @since 1.0.0
-     */
-    final public function getWriteResult(): WriteResult {}
-}
diff --git a/mongodb/Manager.php b/mongodb/Manager.php
index 57fe60051..878e2b5bb 100644
--- a/mongodb/Manager.php
+++ b/mongodb/Manager.php
@@ -9,7 +9,6 @@
 use MongoDB\Driver\Exception\InvalidArgumentException;
 use MongoDB\Driver\Exception\RuntimeException;
 use MongoDB\Driver\Exception\WriteConcernException;
-use MongoDB\Driver\Exception\WriteException;
 use MongoDB\Driver\Monitoring\Subscriber;
 
 /**
@@ -48,7 +47,7 @@ final public function createClientEncryption(array $options) {}
      * @link https://php.net/manual/en/mongodb-driver-manager.executebulkwrite.php
      * @param string $namespace A fully qualified namespace (databaseName.collectionName)
      * @param BulkWrite $bulk The MongoDB\Driver\BulkWrite to execute.
-     * @param array|WriteConcern|null $options WriteConcern type for backwards compatibility
+     * @param array|null $options WriteConcern type for backwards compatibility
      * @throws InvalidArgumentException on argument parsing errors.
      * @throws ConnectionException if connection to the server fails for other then authentication reasons
      * @throws AuthenticationException if authentication is needed and fails
@@ -56,36 +55,36 @@ final public function createClientEncryption(array $options) {}
      * @throws RuntimeException on other errors (invalid command, command arguments, ...)
      * @since 1.4.0 added $options argument
      */
-    final public function executeBulkWrite(string $namespace, BulkWrite $bulk, array|WriteConcern|null $options = null): WriteResult {}
+    final public function executeBulkWrite(string $namespace, BulkWrite $bulk, array|null $options = null): WriteResult {}
 
     /**
      * @link https://php.net/manual/en/mongodb-driver-manager.executecommand.php
      * @param string $db The name of the database on which to execute the command.
      * @param Command $command The command document.
-     * @param array|ReadPreference|null $options ReadPreference type for backwards compatibility
+     * @param array|null $options ReadPreference type for backwards compatibility
      * @throws Exception
      * @throws AuthenticationException if authentication is needed and fails
      * @throws ConnectionException if connection to the server fails for other then authentication reasons
      * @throws RuntimeException on other errors (invalid command, command arguments, ...)
-     * @throws WriteException on Write Error
+     * @throws BulkWriteException on Write Error
      * @throws WriteConcernException on Write Concern failure
      * @since 1.4.0 added $options argument
      */
-    final public function executeCommand(string $db, Command $command, array|ReadPreference|null $options = null): Cursor {}
+    final public function executeCommand(string $db, Command $command, array|null $options = null): CursorInterface {}
 
     /**
      * Execute a MongoDB query
      * @link https://php.net/manual/en/mongodb-driver-manager.executequery.php
      * @param string $namespace A fully qualified namespace (databaseName.collectionName)
      * @param Query $query A MongoDB\Driver\Query to execute.
-     * @param array|ReadPreference|null $options ReadPreference type for backwards compatibility
+     * @param array|null $options ReadPreference type for backwards compatibility
      * @throws Exception
      * @throws AuthenticationException if authentication is needed and fails
      * @throws ConnectionException if connection to the server fails for other then authentication reasons
      * @throws RuntimeException on other errors (invalid command, command arguments, ...)
      * @since 1.4.0 added $options argument
      */
-    final public function executeQuery(string $namespace, Query $query, array|ReadPreference|null $options = null): Cursor {}
+    final public function executeQuery(string $namespace, Query $query, array|null $options = null): CursorInterface {}
 
     /**
      * @link https://php.net/manual/en/mongodb-driver-manager.executereadcommand.php
@@ -96,11 +95,11 @@ final public function executeQuery(string $namespace, Query $query, array|ReadPr
      * @throws AuthenticationException if authentication is needed and fails
      * @throws ConnectionException if connection to the server fails for other then authentication reasons
      * @throws RuntimeException on other errors (invalid command, command arguments, ...)
-     * @throws WriteException on Write Error
+     * @throws BulkWriteException on Write Error
      * @throws WriteConcernException on Write Concern failure
      * @since 1.4.0
      */
-    final public function executeReadCommand(string $db, Command $command, ?array $options = null): Cursor {}
+    final public function executeReadCommand(string $db, Command $command, ?array $options = null): CursorInterface {}
 
     /**
      * @link https://php.net/manual/en/mongodb-driver-manager.executereadwritecommand.php
@@ -111,11 +110,11 @@ final public function executeReadCommand(string $db, Command $command, ?array $o
      * @throws AuthenticationException if authentication is needed and fails
      * @throws ConnectionException if connection to the server fails for other then authentication reasons
      * @throws RuntimeException on other errors (invalid command, command arguments, ...)
-     * @throws WriteException on Write Error
+     * @throws BulkWriteException on Write Error
      * @throws WriteConcernException on Write Concern failure
      * @since 1.4.0
      */
-    final public function executeReadWriteCommand(string $db, Command $command, ?array $options = null): Cursor {}
+    final public function executeReadWriteCommand(string $db, Command $command, ?array $options = null): CursorInterface {}
 
     /**
      * @link https://php.net/manual/en/mongodb-driver-manager.executewritecommand.php
@@ -126,11 +125,11 @@ final public function executeReadWriteCommand(string $db, Command $command, ?arr
      * @throws AuthenticationException if authentication is needed and fails
      * @throws ConnectionException if connection to the server fails for other then authentication reasons
      * @throws RuntimeException on other errors (invalid command, command arguments, ...)
-     * @throws WriteException on Write Error
+     * @throws BulkWriteException on Write Error
      * @throws WriteConcernException on Write Concern failure
      * @since 1.4.0
      */
-    final public function executeWriteCommand(string $db, Command $command, ?array $options = null): Cursor {}
+    final public function executeWriteCommand(string $db, Command $command, ?array $options = null): CursorInterface {}
 
     /**
      * Return the encryptedFieldsMap auto encryption option for the Manager
diff --git a/mongodb/Monitoring/CommandFailedEvent.php b/mongodb/Monitoring/CommandFailedEvent.php
index 421d874c8..64e64e783 100644
--- a/mongodb/Monitoring/CommandFailedEvent.php
+++ b/mongodb/Monitoring/CommandFailedEvent.php
@@ -93,15 +93,6 @@ final public function getReply(): object {}
      */
     final public function getRequestId(): string {}
 
-    /**
-     * Returns the Server on which the command was executed.
-     * @link https://secure.php.net/manual/en/mongodb-driver-monitoring-commandfailedevent.getserver.php
-     * @return \MongoDB\Driver\Server on which the command was executed.
-     * @since 1.3.0
-     * @deprecated Use getHost and getPort instead.
-     */
-    final public function getServer(): Server {}
-
     /**
      * Returns the load balancer service ID for the command
      * @link https://www.php.net/manual/en/mongodb-driver-monitoring-commandfailedevent.getserviceid.php
diff --git a/mongodb/Monitoring/CommandStartedEvent.php b/mongodb/Monitoring/CommandStartedEvent.php
index c11a61bac..3c708a991 100644
--- a/mongodb/Monitoring/CommandStartedEvent.php
+++ b/mongodb/Monitoring/CommandStartedEvent.php
@@ -83,15 +83,6 @@ final public function getPort(): int {}
      */
     final public function getRequestId(): string {}
 
-    /**
-     * Returns the Server on which the command was executed.
-     * @link https://secure.php.net/manual/en/mongodb-driver-monitoring-commandstartedevent.getserver.php
-     * @return \MongoDB\Driver\Server on which the command was executed.
-     * @since 1.3.0
-     * @deprecated Use getHost and getPort instead.
-     */
-    final public function getServer(): Server {}
-
     /**
      * Returns the load balancer service ID for the command
      * @link https://www.php.net/manual/en/mongodb-driver-monitoring-commandstartedevent.getserviceid.php
diff --git a/mongodb/Monitoring/CommandSubscriber.php b/mongodb/Monitoring/CommandSubscriber.php
index 926f00951..a8fa23bb7 100644
--- a/mongodb/Monitoring/CommandSubscriber.php
+++ b/mongodb/Monitoring/CommandSubscriber.php
@@ -19,7 +19,7 @@ interface CommandSubscriber extends Subscriber
      * @throws \InvalidArgumentException on argument parsing errors.
      * @since 1.3.0
      */
-    public function commandFailed(CommandFailedEvent $event);
+    public function commandFailed(CommandFailedEvent $event): void;
 
     /**
      * Notification method for a started command.
@@ -30,7 +30,7 @@ public function commandFailed(CommandFailedEvent $event);
      * @throws \InvalidArgumentException on argument parsing errors.
      * @since 1.3.0
      */
-    public function commandStarted(CommandStartedEvent $event);
+    public function commandStarted(CommandStartedEvent $event): void;
 
     /**
      * Notification method for a successful command.
@@ -41,5 +41,5 @@ public function commandStarted(CommandStartedEvent $event);
      * @throws \InvalidArgumentException on argument parsing errors.
      * @since 1.3.0
      */
-    public function commandSucceeded(CommandSucceededEvent $event);
+    public function commandSucceeded(CommandSucceededEvent $event): void;
 }
diff --git a/mongodb/Monitoring/CommandSucceededEvent.php b/mongodb/Monitoring/CommandSucceededEvent.php
index ef0932632..4f342473e 100644
--- a/mongodb/Monitoring/CommandSucceededEvent.php
+++ b/mongodb/Monitoring/CommandSucceededEvent.php
@@ -84,15 +84,6 @@ final public function getReply(): object {}
      */
     final public function getRequestId(): string {}
 
-    /**
-     * Returns the Server on which the command was executed.
-     * @link https://secure.php.net/manual/en/mongodb-driver-monitoring-commandsucceededevent.getserver.php
-     * @return \MongoDB\Driver\Server on which the command was executed.
-     * @since 1.3.0
-     * @deprecated Use getHost and getPort instead.
-     */
-    final public function getServer(): Server {}
-
     /**
      * Returns the load balancer service ID for the command
      * @link https://www.php.net/manual/en/mongodb-driver-monitoring-commandsucceededevent.getserviceid.php
diff --git a/mongodb/ReadConcern.php b/mongodb/ReadConcern.php
index f26eb86e7..275fc5ffd 100644
--- a/mongodb/ReadConcern.php
+++ b/mongodb/ReadConcern.php
@@ -3,8 +3,6 @@
 namespace MongoDB\Driver;
 
 use MongoDB\BSON\Serializable;
-use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
 use stdClass;
 
 /**
@@ -12,7 +10,7 @@
  * @link https://php.net/manual/en/class.mongodb-driver-readconcern.php
  * @since 1.1.0
  */
-final class ReadConcern implements Serializable, \Serializable
+final class ReadConcern implements Serializable
 {
     /**
      * @since 1.2.0
@@ -61,21 +59,4 @@ final public function bsonSerialize(): stdClass {}
      * @throws \MongoDB\Driver\Exception\InvalidArgumentException On argument parsing errors.
      */
     final public function isDefault(): bool {}
-
-    /**
-     * Serialize a ReadConcern
-     * @since 1.7.0
-     * @link https://php.net/manual/en/mongodb-driver-readconcern.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a ReadConcern
-     * @since 1.7.0
-     * @link https://php.net/manual/en/mongodb-driver-readconcern.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
 }
diff --git a/mongodb/ReadPreference.php b/mongodb/ReadPreference.php
index e410acd3c..bfac64eb5 100644
--- a/mongodb/ReadPreference.php
+++ b/mongodb/ReadPreference.php
@@ -4,30 +4,14 @@
 
 use MongoDB\BSON\Serializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
 use stdClass;
 
 /**
  * Class ReadPreference
  * @link https://php.net/manual/en/class.mongodb-driver-readpreference.php
  */
-final class ReadPreference implements Serializable, \Serializable
+final class ReadPreference implements Serializable
 {
-    /** @deprecated */
-    public const RP_PRIMARY = 1;
-
-    /** @deprecated */
-    public const RP_PRIMARY_PREFERRED = 5;
-
-    /** @deprecated */
-    public const RP_SECONDARY = 2;
-
-    /** @deprecated */
-    public const RP_SECONDARY_PREFERRED = 6;
-
-    /** @deprecated */
-    public const RP_NEAREST = 10;
-
     /**
      * @since 1.7.0
      */
@@ -66,12 +50,12 @@ final class ReadPreference implements Serializable, \Serializable
     /**
      * Construct immutable ReadPreference
      * @link https://php.net/manual/en/mongodb-driver-readpreference.construct.php
-     * @param string|int $mode
+     * @param string $mode
      * @param array|null $tagSets
      * @param array|null $options
      * @throws InvalidArgumentException if mode is invalid or if tagSets is provided for a primary read preference.
      */
-    final public function __construct(string|int $mode, ?array $tagSets = null, ?array $options = null) {}
+    final public function __construct(string $mode, ?array $tagSets = null, ?array $options = null) {}
 
     public static function __set_state(array $properties) {}
 
@@ -82,13 +66,6 @@ public static function __set_state(array $properties) {}
      */
     final public function getHedge(): ?object {}
 
-    /**
-     * Returns the ReadPreference's "mode" option
-     * @link https://php.net/manual/en/mongodb-driver-readpreference.getmode.php
-     * @deprecated Use getModeString instead
-     */
-    final public function getMode(): int {}
-
     /**
      * Returns the ReadPreference's "mode" option as a string
      * @since 1.7.0
@@ -112,22 +89,5 @@ final public function getTagSets(): array {}
      */
     final public function bsonSerialize(): stdClass {}
 
-    /**
-     * Serialize a ReadPreference
-     * @since 1.7.0
-     * @link https://php.net/manual/en/mongodb-driver-readpreference.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a ReadPreference
-     * @since 1.7.0
-     * @link https://php.net/manual/en/mongodb-driver-readpreference.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
-
     final public function getMaxStalenessSeconds() {}
 }
diff --git a/mongodb/Server.php b/mongodb/Server.php
index b396b5f2a..0263daa5a 100644
--- a/mongodb/Server.php
+++ b/mongodb/Server.php
@@ -42,7 +42,7 @@ final public function __wakeup() {}
      * @link https://php.net/manual/en/mongodb-driver-server.executebulkwrite.php
      * @param string $namespace A fully qualified namespace (e.g. "databaseName.collectionName").
      * @param BulkWrite $bulkWrite The MongoDB\Driver\BulkWrite to execute.
-     * @param array|WriteConcern|null $options
+     * @param array|null $options
      * @throws BulkWriteException on any write failure (e.g. write error, failure to apply a write concern).
      * @throws InvalidArgumentException on argument parsing errors.
      * @throws ConnectionException if connection to the server fails (for reasons other than authentication).
@@ -51,14 +51,14 @@ final public function __wakeup() {}
      * @return WriteResult
      * @since 1.0.0
      */
-    final public function executeBulkWrite(string $namespace, BulkWrite $bulkWrite, array|WriteConcern|null $options = null): WriteResult {}
+    final public function executeBulkWrite(string $namespace, BulkWrite $bulkWrite, array|null $options = null): WriteResult {}
 
     /**
      * Execute a database command on this server
      * @link https://php.net/manual/en/mongodb-driver-server.executecommand.php
      * @param string $db The name of the database on which to execute the command.
      * @param Command $command The MongoDB\Driver\Command to execute.
-     * @param array|ReadPreference|null $options Optionally, a MongoDB\Driver\ReadPreference to select the server for this operation. If none is given, the read preference from the MongoDB Connection URI will be used.
+     * @param array|null $options Optionally, a MongoDB\Driver\ReadPreference to select the server for this operation. If none is given, the read preference from the MongoDB Connection URI will be used.
      * @throws InvalidArgumentException on argument parsing errors.
      * @throws ConnectionException if connection to the server fails (for reasons other than authentication).
      * @throws AuthenticationException if authentication is needed and fails.
@@ -66,7 +66,7 @@ final public function executeBulkWrite(string $namespace, BulkWrite $bulkWrite,
      * @return Cursor
      * @since 1.0.0
      */
-    final public function executeCommand(string $db, Command $command, array|ReadPreference|null $options = null): Cursor {}
+    final public function executeCommand(string $db, Command $command, array|null $options = null): CursorInterface {}
 
     /**
      * Execute a database command that reads on this server
@@ -80,7 +80,7 @@ final public function executeCommand(string $db, Command $command, array|ReadPre
      * @throws RuntimeException On other errors (e.g. invalid command).
      * @since 1.4.0
      */
-    final public function executeReadCommand(string $db, Command $command, ?array $options = null): Cursor {}
+    final public function executeReadCommand(string $db, Command $command, ?array $options = null): CursorInterface {}
 
     /**
      * Execute a database command that reads and writes on this server
@@ -94,7 +94,7 @@ final public function executeReadCommand(string $db, Command $command, ?array $o
      * @throws RuntimeException On other errors (e.g. invalid command).
      * @since 1.4.0
      */
-    final public function executeReadWriteCommand(string $db, Command $command, ?array $options = null): Cursor {}
+    final public function executeReadWriteCommand(string $db, Command $command, ?array $options = null): CursorInterface {}
 
     /**
      * Execute a database command that writes on this server
@@ -108,7 +108,7 @@ final public function executeReadWriteCommand(string $db, Command $command, ?arr
      * @throws RuntimeException On other errors (e.g. invalid command).
      * @since 1.4.0
      */
-    final public function executeWriteCommand(string $db, Command $command, ?array $options = null): Cursor {}
+    final public function executeWriteCommand(string $db, Command $command, ?array $options = null): CursorInterface {}
 
     /**
      * Execute a database query on this server
@@ -122,7 +122,7 @@ final public function executeWriteCommand(string $db, Command $command, ?array $
      * @throws RuntimeException on other errors (e.g. invalid command, issuing a write command to a secondary).
      * @return Cursor
      */
-    final public function executeQuery(string $namespace, Query $query, array|ReadPreference|null $options = null): Cursor {}
+    final public function executeQuery(string $namespace, Query $query, array|ReadPreference|null $options = null): CursorInterface {}
 
     /**
      * Returns the hostname of this server
diff --git a/mongodb/ServerApi.php b/mongodb/ServerApi.php
index da4a8c015..69aad908c 100644
--- a/mongodb/ServerApi.php
+++ b/mongodb/ServerApi.php
@@ -2,9 +2,10 @@
 
 namespace MongoDB\Driver;
 
+use MongoDB\BSON\Serializable;
 use stdClass;
 
-final class ServerApi implements \MongoDB\BSON\Serializable, \Serializable
+final class ServerApi implements Serializable
 {
     public const V1 = 1;
 
@@ -12,9 +13,5 @@ final public function __construct(string $version, ?bool $strict = false, ?bool
 
     public static function __set_state(array $properties) {}
 
-    final public function unserialize(string $data): void {}
-
-    final public function serialize(): string {}
-
     final public function bsonSerialize(): stdClass {}
 }
diff --git a/mongodb/WriteConcern.php b/mongodb/WriteConcern.php
index 26b6be8b6..0c77beb2f 100644
--- a/mongodb/WriteConcern.php
+++ b/mongodb/WriteConcern.php
@@ -4,13 +4,12 @@
 
 use MongoDB\BSON\Serializable;
 use MongoDB\Driver\Exception\InvalidArgumentException;
-use MongoDB\Driver\Exception\UnexpectedValueException;
 use stdClass;
 
 /**
  * WriteConcern controls the acknowledgment of a write operation, specifies the level of write guarantee for Replica Sets.
  */
-final class WriteConcern implements Serializable, \Serializable
+final class WriteConcern implements Serializable
 {
     /**
      * Majority of all the members in the set; arbiters, non-voting members, passive members, hidden members and delayed members are all included in the definition of majority write concern.
@@ -56,22 +55,5 @@ final public function getWtimeout(): int {}
      */
     final public function bsonSerialize(): stdClass {}
 
-    /**
-     * Serialize a WriteConcern
-     * @since 1.7.0
-     * @link https://php.net/manual/en/mongodb-driver-writeconcern.serialize.php
-     * @throws InvalidArgumentException
-     */
-    final public function serialize(): string {}
-
-    /**
-     * Unserialize a WriteConcern
-     * @since 1.7.0
-     * @link https://php.net/manual/en/mongodb-driver-writeconcern.unserialize.php
-     * @throws InvalidArgumentException on argument parsing errors or if the properties are invalid
-     * @throws UnexpectedValueException if the properties cannot be unserialized (i.e. serialized was malformed)
-     */
-    final public function unserialize(string $data): void {}
-
     final public function isDefault(): bool {}
 }
diff --git a/mongodb/WriteResult.php b/mongodb/WriteResult.php
index 06b995180..0f148b734 100644
--- a/mongodb/WriteResult.php
+++ b/mongodb/WriteResult.php
@@ -13,28 +13,28 @@ final private function __construct() {}
     final public function __wakeup() {}
 
     /**
-     * Returns the number of documents deleted
+     * Returns the number of documents deleted. Throws an exception if the write was unacknowledged
      * @link https://php.net/manual/en/mongodb-driver-writeresult.getdeletedcount.php
      */
-    final public function getDeletedCount(): ?int {}
+    final public function getDeletedCount(): int {}
 
     /**
-     * Returns the number of documents inserted (excluding upserts)
+     * Returns the number of documents inserted (excluding upserts). Throws an exception if the write was unacknowledged
      * @link https://php.net/manual/en/mongodb-driver-writeresult.getinsertedcount.php
      */
-    final public function getInsertedCount(): ?int {}
+    final public function getInsertedCount(): int {}
 
     /**
-     * Returns the number of documents selected for update
+     * Returns the number of documents selected for update. Throws an exception if the write was unacknowledged
      * @link https://php.net/manual/en/mongodb-driver-writeresult.getmatchedcount.php
      */
-    final public function getMatchedCount(): ?int {}
+    final public function getMatchedCount(): int {}
 
     /**
-     * Returns the number of existing documents updated
+     * Returns the number of existing documents updated. Throws an exception if the write was unacknowledged
      * @link https://php.net/manual/en/mongodb-driver-writeresult.getmodifiedcount.php
      */
-    final public function getModifiedCount(): ?int {}
+    final public function getModifiedCount(): int {}
 
     /**
      * Returns the server associated with this write result
@@ -43,10 +43,10 @@ final public function getModifiedCount(): ?int {}
     final public function getServer(): Server {}
 
     /**
-     * Returns the number of documents inserted by an upsert
+     * Returns the number of documents inserted by an upsert. Throws an exception if the write was unacknowledged
      * @link https://php.net/manual/en/mongodb-driver-writeresult.getupsertedcount.php
      */
-    final public function getUpsertedCount(): ?int {}
+    final public function getUpsertedCount(): int {}
 
     /**
      * Returns an array of identifiers for upserted documents