diff --git a/README.md b/README.md
index de32be1..426c314 100644
--- a/README.md
+++ b/README.md
@@ -33,7 +33,7 @@ Add the package to your `Package.swift` dependencies:
 
 ```swift
     dependencies: [
-        .package(url: "git@github.com:appwrite/sdk-for-swift.git", from: "6.0.0"),
+        .package(url: "git@github.com:appwrite/sdk-for-swift.git", from: "6.1.0"),
     ],
 ```
 
diff --git a/Sources/Appwrite/Client.swift b/Sources/Appwrite/Client.swift
index 126415d..4d6ae63 100644
--- a/Sources/Appwrite/Client.swift
+++ b/Sources/Appwrite/Client.swift
@@ -21,7 +21,7 @@ open class Client {
         "x-sdk-name": "Swift",
         "x-sdk-platform": "server",
         "x-sdk-language": "swift",
-        "x-sdk-version": "6.0.0",
+        "x-sdk-version": "6.1.0",
         "x-appwrite-response-format": "1.6.0"
     ]
 
diff --git a/Sources/Appwrite/Services/Databases.swift b/Sources/Appwrite/Services/Databases.swift
index ba690e6..7e196e7 100644
--- a/Sources/Appwrite/Services/Databases.swift
+++ b/Sources/Appwrite/Services/Databases.swift
@@ -512,6 +512,7 @@ open class Databases: Service {
     /// @param String key
     /// @param Bool required
     /// @param Bool default
+    /// @param String newKey
     /// @throws Exception
     /// @return array
     ///
@@ -520,7 +521,8 @@ open class Databases: Service {
         collectionId: String,
         key: String,
         `required`: Bool,
-        `default`: Bool? = nil
+        `default`: Bool? = nil,
+        newKey: String? = nil
     ) async throws -> AppwriteModels.AttributeBoolean {
         let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/boolean/{key}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -529,7 +531,8 @@ open class Databases: Service {
 
         let apiParams: [String: Any?] = [
             "required": `required`,
-            "default": `default`
+            "default": `default`,
+            "newKey": newKey
         ]
 
         let apiHeaders: [String: String] = [
@@ -610,6 +613,7 @@ open class Databases: Service {
     /// @param String key
     /// @param Bool required
     /// @param String default
+    /// @param String newKey
     /// @throws Exception
     /// @return array
     ///
@@ -618,7 +622,8 @@ open class Databases: Service {
         collectionId: String,
         key: String,
         `required`: Bool,
-        `default`: String? = nil
+        `default`: String? = nil,
+        newKey: String? = nil
     ) async throws -> AppwriteModels.AttributeDatetime {
         let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/datetime/{key}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -627,7 +632,8 @@ open class Databases: Service {
 
         let apiParams: [String: Any?] = [
             "required": `required`,
-            "default": `default`
+            "default": `default`,
+            "newKey": newKey
         ]
 
         let apiHeaders: [String: String] = [
@@ -710,6 +716,7 @@ open class Databases: Service {
     /// @param String key
     /// @param Bool required
     /// @param String default
+    /// @param String newKey
     /// @throws Exception
     /// @return array
     ///
@@ -718,7 +725,8 @@ open class Databases: Service {
         collectionId: String,
         key: String,
         `required`: Bool,
-        `default`: String? = nil
+        `default`: String? = nil,
+        newKey: String? = nil
     ) async throws -> AppwriteModels.AttributeEmail {
         let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/email/{key}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -727,7 +735,8 @@ open class Databases: Service {
 
         let apiParams: [String: Any?] = [
             "required": `required`,
-            "default": `default`
+            "default": `default`,
+            "newKey": newKey
         ]
 
         let apiHeaders: [String: String] = [
@@ -815,6 +824,7 @@ open class Databases: Service {
     /// @param [String] elements
     /// @param Bool required
     /// @param String default
+    /// @param String newKey
     /// @throws Exception
     /// @return array
     ///
@@ -824,7 +834,8 @@ open class Databases: Service {
         key: String,
         elements: [String],
         `required`: Bool,
-        `default`: String? = nil
+        `default`: String? = nil,
+        newKey: String? = nil
     ) async throws -> AppwriteModels.AttributeEnum {
         let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/enum/{key}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -834,7 +845,8 @@ open class Databases: Service {
         let apiParams: [String: Any?] = [
             "elements": elements,
             "required": `required`,
-            "default": `default`
+            "default": `default`,
+            "newKey": newKey
         ]
 
         let apiHeaders: [String: String] = [
@@ -926,6 +938,7 @@ open class Databases: Service {
     /// @param Double min
     /// @param Double max
     /// @param Double default
+    /// @param String newKey
     /// @throws Exception
     /// @return array
     ///
@@ -936,7 +949,8 @@ open class Databases: Service {
         `required`: Bool,
         min: Double,
         max: Double,
-        `default`: Double? = nil
+        `default`: Double? = nil,
+        newKey: String? = nil
     ) async throws -> AppwriteModels.AttributeFloat {
         let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/float/{key}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -947,7 +961,8 @@ open class Databases: Service {
             "required": `required`,
             "min": min,
             "max": max,
-            "default": `default`
+            "default": `default`,
+            "newKey": newKey
         ]
 
         let apiHeaders: [String: String] = [
@@ -1039,6 +1054,7 @@ open class Databases: Service {
     /// @param Int min
     /// @param Int max
     /// @param Int default
+    /// @param String newKey
     /// @throws Exception
     /// @return array
     ///
@@ -1049,7 +1065,8 @@ open class Databases: Service {
         `required`: Bool,
         min: Int,
         max: Int,
-        `default`: Int? = nil
+        `default`: Int? = nil,
+        newKey: String? = nil
     ) async throws -> AppwriteModels.AttributeInteger {
         let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/integer/{key}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -1060,7 +1077,8 @@ open class Databases: Service {
             "required": `required`,
             "min": min,
             "max": max,
-            "default": `default`
+            "default": `default`,
+            "newKey": newKey
         ]
 
         let apiHeaders: [String: String] = [
@@ -1143,6 +1161,7 @@ open class Databases: Service {
     /// @param String key
     /// @param Bool required
     /// @param String default
+    /// @param String newKey
     /// @throws Exception
     /// @return array
     ///
@@ -1151,7 +1170,8 @@ open class Databases: Service {
         collectionId: String,
         key: String,
         `required`: Bool,
-        `default`: String? = nil
+        `default`: String? = nil,
+        newKey: String? = nil
     ) async throws -> AppwriteModels.AttributeIp {
         let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/ip/{key}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -1160,7 +1180,8 @@ open class Databases: Service {
 
         let apiParams: [String: Any?] = [
             "required": `required`,
-            "default": `default`
+            "default": `default`,
+            "newKey": newKey
         ]
 
         let apiHeaders: [String: String] = [
@@ -1307,6 +1328,8 @@ open class Databases: Service {
     /// @param String key
     /// @param Bool required
     /// @param String default
+    /// @param Int size
+    /// @param String newKey
     /// @throws Exception
     /// @return array
     ///
@@ -1315,7 +1338,9 @@ open class Databases: Service {
         collectionId: String,
         key: String,
         `required`: Bool,
-        `default`: String? = nil
+        `default`: String? = nil,
+        size: Int? = nil,
+        newKey: String? = nil
     ) async throws -> AppwriteModels.AttributeString {
         let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/string/{key}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -1324,7 +1349,9 @@ open class Databases: Service {
 
         let apiParams: [String: Any?] = [
             "required": `required`,
-            "default": `default`
+            "default": `default`,
+            "size": size,
+            "newKey": newKey
         ]
 
         let apiHeaders: [String: String] = [
@@ -1407,6 +1434,7 @@ open class Databases: Service {
     /// @param String key
     /// @param Bool required
     /// @param String default
+    /// @param String newKey
     /// @throws Exception
     /// @return array
     ///
@@ -1415,7 +1443,8 @@ open class Databases: Service {
         collectionId: String,
         key: String,
         `required`: Bool,
-        `default`: String? = nil
+        `default`: String? = nil,
+        newKey: String? = nil
     ) async throws -> AppwriteModels.AttributeUrl {
         let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/url/{key}"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -1424,7 +1453,8 @@ open class Databases: Service {
 
         let apiParams: [String: Any?] = [
             "required": `required`,
-            "default": `default`
+            "default": `default`,
+            "newKey": newKey
         ]
 
         let apiHeaders: [String: String] = [
@@ -1523,6 +1553,7 @@ open class Databases: Service {
     /// @param String collectionId
     /// @param String key
     /// @param AppwriteEnums.RelationMutate onDelete
+    /// @param String newKey
     /// @throws Exception
     /// @return array
     ///
@@ -1530,7 +1561,8 @@ open class Databases: Service {
         databaseId: String,
         collectionId: String,
         key: String,
-        onDelete: AppwriteEnums.RelationMutate? = nil
+        onDelete: AppwriteEnums.RelationMutate? = nil,
+        newKey: String? = nil
     ) async throws -> AppwriteModels.AttributeRelationship {
         let apiPath: String = "/databases/{databaseId}/collections/{collectionId}/attributes/{key}/relationship"
             .replacingOccurrences(of: "{databaseId}", with: databaseId)
@@ -1538,7 +1570,8 @@ open class Databases: Service {
             .replacingOccurrences(of: "{key}", with: key)
 
         let apiParams: [String: Any?] = [
-            "onDelete": onDelete
+            "onDelete": onDelete,
+            "newKey": newKey
         ]
 
         let apiHeaders: [String: String] = [
diff --git a/Sources/AppwriteModels/AlgoArgon2.swift b/Sources/AppwriteModels/AlgoArgon2.swift
index b473771..c93c034 100644
--- a/Sources/AppwriteModels/AlgoArgon2.swift
+++ b/Sources/AppwriteModels/AlgoArgon2.swift
@@ -7,20 +7,16 @@ public class AlgoArgon2 {
     /// Algo type.
     public let type: String
 
-
     /// Memory used to compute hash.
     public let memoryCost: Int
 
-
     /// Amount of time consumed to compute hash
     public let timeCost: Int
 
-
     /// Number of threads used to compute hash.
     public let threads: Int
 
 
-
     init(
         type: String,
         memoryCost: Int,
diff --git a/Sources/AppwriteModels/AlgoBcrypt.swift b/Sources/AppwriteModels/AlgoBcrypt.swift
index 3635cec..8d59f2d 100644
--- a/Sources/AppwriteModels/AlgoBcrypt.swift
+++ b/Sources/AppwriteModels/AlgoBcrypt.swift
@@ -8,7 +8,6 @@ public class AlgoBcrypt {
     public let type: String
 
 
-
     init(
         type: String
     ) {
diff --git a/Sources/AppwriteModels/AlgoMd5.swift b/Sources/AppwriteModels/AlgoMd5.swift
index db970a6..050fe5c 100644
--- a/Sources/AppwriteModels/AlgoMd5.swift
+++ b/Sources/AppwriteModels/AlgoMd5.swift
@@ -8,7 +8,6 @@ public class AlgoMd5 {
     public let type: String
 
 
-
     init(
         type: String
     ) {
diff --git a/Sources/AppwriteModels/AlgoPhpass.swift b/Sources/AppwriteModels/AlgoPhpass.swift
index fe960fb..493463d 100644
--- a/Sources/AppwriteModels/AlgoPhpass.swift
+++ b/Sources/AppwriteModels/AlgoPhpass.swift
@@ -8,7 +8,6 @@ public class AlgoPhpass {
     public let type: String
 
 
-
     init(
         type: String
     ) {
diff --git a/Sources/AppwriteModels/AlgoScrypt.swift b/Sources/AppwriteModels/AlgoScrypt.swift
index 8821bfb..73254f2 100644
--- a/Sources/AppwriteModels/AlgoScrypt.swift
+++ b/Sources/AppwriteModels/AlgoScrypt.swift
@@ -7,24 +7,19 @@ public class AlgoScrypt {
     /// Algo type.
     public let type: String
 
-
     /// CPU complexity of computed hash.
     public let costCpu: Int
 
-
     /// Memory complexity of computed hash.
     public let costMemory: Int
 
-
     /// Parallelization of computed hash.
     public let costParallel: Int
 
-
     /// Length used to compute hash.
     public let length: Int
 
 
-
     init(
         type: String,
         costCpu: Int,
diff --git a/Sources/AppwriteModels/AlgoScryptModified.swift b/Sources/AppwriteModels/AlgoScryptModified.swift
index 0adf147..bc1fde5 100644
--- a/Sources/AppwriteModels/AlgoScryptModified.swift
+++ b/Sources/AppwriteModels/AlgoScryptModified.swift
@@ -7,20 +7,16 @@ public class AlgoScryptModified {
     /// Algo type.
     public let type: String
 
-
     /// Salt used to compute hash.
     public let salt: String
 
-
     /// Separator used to compute hash.
     public let saltSeparator: String
 
-
     /// Key used to compute hash.
     public let signerKey: String
 
 
-
     init(
         type: String,
         salt: String,
diff --git a/Sources/AppwriteModels/AlgoSha.swift b/Sources/AppwriteModels/AlgoSha.swift
index 88d6bfc..c0a0532 100644
--- a/Sources/AppwriteModels/AlgoSha.swift
+++ b/Sources/AppwriteModels/AlgoSha.swift
@@ -8,7 +8,6 @@ public class AlgoSha {
     public let type: String
 
 
-
     init(
         type: String
     ) {
diff --git a/Sources/AppwriteModels/AttributeBoolean.swift b/Sources/AppwriteModels/AttributeBoolean.swift
index 6df80cb..11bb89c 100644
--- a/Sources/AppwriteModels/AttributeBoolean.swift
+++ b/Sources/AppwriteModels/AttributeBoolean.swift
@@ -7,32 +7,25 @@ public class AttributeBoolean {
     /// Attribute Key.
     public let key: String
 
-
     /// Attribute type.
     public let type: String
 
-
     /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an attribute.
     public let error: String
 
-
     /// Is attribute required?
     public let `required`: Bool
 
-
     /// Is attribute an array?
     public let array: Bool?
 
-
     /// Default value for attribute when not provided. Cannot be set when attribute is required.
     public let `default`: Bool?
 
 
-
     init(
         key: String,
         type: String,
@@ -70,8 +63,8 @@ public class AttributeBoolean {
             status: map["status"] as! String,
             error: map["error"] as! String,
             `required`: map["required"] as! Bool,
-            array: map["array"] as? Bool?,
-            `default`: map["default"] as? Bool?
+            array: map["array"] as? Bool,
+            `default`: map["default"] as? Bool
         )
     }
 }
diff --git a/Sources/AppwriteModels/AttributeDatetime.swift b/Sources/AppwriteModels/AttributeDatetime.swift
index 7f1017f..24beb48 100644
--- a/Sources/AppwriteModels/AttributeDatetime.swift
+++ b/Sources/AppwriteModels/AttributeDatetime.swift
@@ -7,36 +7,28 @@ public class AttributeDatetime {
     /// Attribute Key.
     public let key: String
 
-
     /// Attribute type.
     public let type: String
 
-
     /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an attribute.
     public let error: String
 
-
     /// Is attribute required?
     public let `required`: Bool
 
-
     /// Is attribute an array?
     public let array: Bool?
 
-
     /// ISO 8601 format.
     public let format: String
 
-
     /// Default value for attribute when not provided. Only null is optional
     public let `default`: String?
 
 
-
     init(
         key: String,
         type: String,
@@ -77,9 +69,9 @@ public class AttributeDatetime {
             status: map["status"] as! String,
             error: map["error"] as! String,
             `required`: map["required"] as! Bool,
-            array: map["array"] as? Bool?,
+            array: map["array"] as? Bool,
             format: map["format"] as! String,
-            `default`: map["default"] as? String?
+            `default`: map["default"] as? String
         )
     }
 }
diff --git a/Sources/AppwriteModels/AttributeEmail.swift b/Sources/AppwriteModels/AttributeEmail.swift
index 41d7355..f6a7098 100644
--- a/Sources/AppwriteModels/AttributeEmail.swift
+++ b/Sources/AppwriteModels/AttributeEmail.swift
@@ -7,36 +7,28 @@ public class AttributeEmail {
     /// Attribute Key.
     public let key: String
 
-
     /// Attribute type.
     public let type: String
 
-
     /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an attribute.
     public let error: String
 
-
     /// Is attribute required?
     public let `required`: Bool
 
-
     /// Is attribute an array?
     public let array: Bool?
 
-
     /// String format.
     public let format: String
 
-
     /// Default value for attribute when not provided. Cannot be set when attribute is required.
     public let `default`: String?
 
 
-
     init(
         key: String,
         type: String,
@@ -77,9 +69,9 @@ public class AttributeEmail {
             status: map["status"] as! String,
             error: map["error"] as! String,
             `required`: map["required"] as! Bool,
-            array: map["array"] as? Bool?,
+            array: map["array"] as? Bool,
             format: map["format"] as! String,
-            `default`: map["default"] as? String?
+            `default`: map["default"] as? String
         )
     }
 }
diff --git a/Sources/AppwriteModels/AttributeEnum.swift b/Sources/AppwriteModels/AttributeEnum.swift
index e576ffb..003f961 100644
--- a/Sources/AppwriteModels/AttributeEnum.swift
+++ b/Sources/AppwriteModels/AttributeEnum.swift
@@ -7,40 +7,31 @@ public class AttributeEnum {
     /// Attribute Key.
     public let key: String
 
-
     /// Attribute type.
     public let type: String
 
-
     /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an attribute.
     public let error: String
 
-
     /// Is attribute required?
     public let `required`: Bool
 
-
     /// Is attribute an array?
     public let array: Bool?
 
-
     /// Array of elements in enumerated type.
     public let elements: [Any]
 
-
     /// String format.
     public let format: String
 
-
     /// Default value for attribute when not provided. Cannot be set when attribute is required.
     public let `default`: String?
 
 
-
     init(
         key: String,
         type: String,
@@ -84,10 +75,10 @@ public class AttributeEnum {
             status: map["status"] as! String,
             error: map["error"] as! String,
             `required`: map["required"] as! Bool,
-            array: map["array"] as? Bool?,
+            array: map["array"] as? Bool,
             elements: map["elements"] as! [Any],
             format: map["format"] as! String,
-            `default`: map["default"] as? String?
+            `default`: map["default"] as? String
         )
     }
 }
diff --git a/Sources/AppwriteModels/AttributeFloat.swift b/Sources/AppwriteModels/AttributeFloat.swift
index f7c96fa..27869a1 100644
--- a/Sources/AppwriteModels/AttributeFloat.swift
+++ b/Sources/AppwriteModels/AttributeFloat.swift
@@ -7,40 +7,31 @@ public class AttributeFloat {
     /// Attribute Key.
     public let key: String
 
-
     /// Attribute type.
     public let type: String
 
-
     /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an attribute.
     public let error: String
 
-
     /// Is attribute required?
     public let `required`: Bool
 
-
     /// Is attribute an array?
     public let array: Bool?
 
-
     /// Minimum value to enforce for new documents.
     public let min: Double?
 
-
     /// Maximum value to enforce for new documents.
     public let max: Double?
 
-
     /// Default value for attribute when not provided. Cannot be set when attribute is required.
     public let `default`: Double?
 
 
-
     init(
         key: String,
         type: String,
@@ -84,10 +75,10 @@ public class AttributeFloat {
             status: map["status"] as! String,
             error: map["error"] as! String,
             `required`: map["required"] as! Bool,
-            array: map["array"] as? Bool?,
-            min: map["min"] as? Double?,
-            max: map["max"] as? Double?,
-            `default`: map["default"] as? Double?
+            array: map["array"] as? Bool,
+            min: map["min"] as? Double,
+            max: map["max"] as? Double,
+            `default`: map["default"] as? Double
         )
     }
 }
diff --git a/Sources/AppwriteModels/AttributeInteger.swift b/Sources/AppwriteModels/AttributeInteger.swift
index 2158768..bf85a88 100644
--- a/Sources/AppwriteModels/AttributeInteger.swift
+++ b/Sources/AppwriteModels/AttributeInteger.swift
@@ -7,40 +7,31 @@ public class AttributeInteger {
     /// Attribute Key.
     public let key: String
 
-
     /// Attribute type.
     public let type: String
 
-
     /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an attribute.
     public let error: String
 
-
     /// Is attribute required?
     public let `required`: Bool
 
-
     /// Is attribute an array?
     public let array: Bool?
 
-
     /// Minimum value to enforce for new documents.
     public let min: Int?
 
-
     /// Maximum value to enforce for new documents.
     public let max: Int?
 
-
     /// Default value for attribute when not provided. Cannot be set when attribute is required.
     public let `default`: Int?
 
 
-
     init(
         key: String,
         type: String,
@@ -84,10 +75,10 @@ public class AttributeInteger {
             status: map["status"] as! String,
             error: map["error"] as! String,
             `required`: map["required"] as! Bool,
-            array: map["array"] as? Bool?,
-            min: map["min"] as? Int?,
-            max: map["max"] as? Int?,
-            `default`: map["default"] as? Int?
+            array: map["array"] as? Bool,
+            min: map["min"] as? Int,
+            max: map["max"] as? Int,
+            `default`: map["default"] as? Int
         )
     }
 }
diff --git a/Sources/AppwriteModels/AttributeIp.swift b/Sources/AppwriteModels/AttributeIp.swift
index 2f4e558..5bce92e 100644
--- a/Sources/AppwriteModels/AttributeIp.swift
+++ b/Sources/AppwriteModels/AttributeIp.swift
@@ -7,36 +7,28 @@ public class AttributeIp {
     /// Attribute Key.
     public let key: String
 
-
     /// Attribute type.
     public let type: String
 
-
     /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an attribute.
     public let error: String
 
-
     /// Is attribute required?
     public let `required`: Bool
 
-
     /// Is attribute an array?
     public let array: Bool?
 
-
     /// String format.
     public let format: String
 
-
     /// Default value for attribute when not provided. Cannot be set when attribute is required.
     public let `default`: String?
 
 
-
     init(
         key: String,
         type: String,
@@ -77,9 +69,9 @@ public class AttributeIp {
             status: map["status"] as! String,
             error: map["error"] as! String,
             `required`: map["required"] as! Bool,
-            array: map["array"] as? Bool?,
+            array: map["array"] as? Bool,
             format: map["format"] as! String,
-            `default`: map["default"] as? String?
+            `default`: map["default"] as? String
         )
     }
 }
diff --git a/Sources/AppwriteModels/AttributeList.swift b/Sources/AppwriteModels/AttributeList.swift
index d0fd299..a4a070f 100644
--- a/Sources/AppwriteModels/AttributeList.swift
+++ b/Sources/AppwriteModels/AttributeList.swift
@@ -7,12 +7,10 @@ public class AttributeList {
     /// Total number of attributes in the given collection.
     public let total: Int
 
-
     /// List of attributes.
     public let attributes: [Any]
 
 
-
     init(
         total: Int,
         attributes: [Any]
diff --git a/Sources/AppwriteModels/AttributeRelationship.swift b/Sources/AppwriteModels/AttributeRelationship.swift
index 8facd9b..b1246a7 100644
--- a/Sources/AppwriteModels/AttributeRelationship.swift
+++ b/Sources/AppwriteModels/AttributeRelationship.swift
@@ -7,52 +7,40 @@ public class AttributeRelationship {
     /// Attribute Key.
     public let key: String
 
-
     /// Attribute type.
     public let type: String
 
-
     /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an attribute.
     public let error: String
 
-
     /// Is attribute required?
     public let `required`: Bool
 
-
     /// Is attribute an array?
     public let array: Bool?
 
-
     /// The ID of the related collection.
     public let relatedCollection: String
 
-
     /// The type of the relationship.
     public let relationType: String
 
-
     /// Is the relationship two-way?
     public let twoWay: Bool
 
-
     /// The key of the two-way relationship.
     public let twoWayKey: String
 
-
     /// How deleting the parent document will propagate to child documents.
     public let onDelete: String
 
-
     /// Whether this is the parent or child side of the relationship
     public let side: String
 
 
-
     init(
         key: String,
         type: String,
@@ -105,7 +93,7 @@ public class AttributeRelationship {
             status: map["status"] as! String,
             error: map["error"] as! String,
             `required`: map["required"] as! Bool,
-            array: map["array"] as? Bool?,
+            array: map["array"] as? Bool,
             relatedCollection: map["relatedCollection"] as! String,
             relationType: map["relationType"] as! String,
             twoWay: map["twoWay"] as! Bool,
diff --git a/Sources/AppwriteModels/AttributeString.swift b/Sources/AppwriteModels/AttributeString.swift
index 4be6e57..c6b0f6e 100644
--- a/Sources/AppwriteModels/AttributeString.swift
+++ b/Sources/AppwriteModels/AttributeString.swift
@@ -7,36 +7,28 @@ public class AttributeString {
     /// Attribute Key.
     public let key: String
 
-
     /// Attribute type.
     public let type: String
 
-
     /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an attribute.
     public let error: String
 
-
     /// Is attribute required?
     public let `required`: Bool
 
-
     /// Is attribute an array?
     public let array: Bool?
 
-
     /// Attribute size.
     public let size: Int
 
-
     /// Default value for attribute when not provided. Cannot be set when attribute is required.
     public let `default`: String?
 
 
-
     init(
         key: String,
         type: String,
@@ -77,9 +69,9 @@ public class AttributeString {
             status: map["status"] as! String,
             error: map["error"] as! String,
             `required`: map["required"] as! Bool,
-            array: map["array"] as? Bool?,
+            array: map["array"] as? Bool,
             size: map["size"] as! Int,
-            `default`: map["default"] as? String?
+            `default`: map["default"] as? String
         )
     }
 }
diff --git a/Sources/AppwriteModels/AttributeUrl.swift b/Sources/AppwriteModels/AttributeUrl.swift
index a038b6e..0853bd6 100644
--- a/Sources/AppwriteModels/AttributeUrl.swift
+++ b/Sources/AppwriteModels/AttributeUrl.swift
@@ -7,36 +7,28 @@ public class AttributeUrl {
     /// Attribute Key.
     public let key: String
 
-
     /// Attribute type.
     public let type: String
 
-
     /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an attribute.
     public let error: String
 
-
     /// Is attribute required?
     public let `required`: Bool
 
-
     /// Is attribute an array?
     public let array: Bool?
 
-
     /// String format.
     public let format: String
 
-
     /// Default value for attribute when not provided. Cannot be set when attribute is required.
     public let `default`: String?
 
 
-
     init(
         key: String,
         type: String,
@@ -77,9 +69,9 @@ public class AttributeUrl {
             status: map["status"] as! String,
             error: map["error"] as! String,
             `required`: map["required"] as! Bool,
-            array: map["array"] as? Bool?,
+            array: map["array"] as? Bool,
             format: map["format"] as! String,
-            `default`: map["default"] as? String?
+            `default`: map["default"] as? String
         )
     }
 }
diff --git a/Sources/AppwriteModels/Bucket.swift b/Sources/AppwriteModels/Bucket.swift
index 8367728..9986ae6 100644
--- a/Sources/AppwriteModels/Bucket.swift
+++ b/Sources/AppwriteModels/Bucket.swift
@@ -7,52 +7,40 @@ public class Bucket {
     /// Bucket ID.
     public let id: String
 
-
     /// Bucket creation time in ISO 8601 format.
     public let createdAt: String
 
-
     /// Bucket update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Bucket permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).
     public let permissions: [Any]
 
-
     /// Whether file-level security is enabled. [Learn more about permissions](https://appwrite.io/docs/permissions).
     public let fileSecurity: Bool
 
-
     /// Bucket name.
     public let name: String
 
-
     /// Bucket enabled.
     public let enabled: Bool
 
-
     /// Maximum file size supported.
     public let maximumFileSize: Int
 
-
     /// Allowed file extensions.
     public let allowedFileExtensions: [Any]
 
-
     /// Compression algorithm choosen for compression. Will be one of none, [gzip](https://en.wikipedia.org/wiki/Gzip), or [zstd](https://en.wikipedia.org/wiki/Zstd).
     public let compression: String
 
-
     /// Bucket is encrypted.
     public let encryption: Bool
 
-
     /// Virus scanning is enabled.
     public let antivirus: Bool
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/BucketList.swift b/Sources/AppwriteModels/BucketList.swift
index 2a26b44..2937fa6 100644
--- a/Sources/AppwriteModels/BucketList.swift
+++ b/Sources/AppwriteModels/BucketList.swift
@@ -7,12 +7,10 @@ public class BucketList {
     /// Total number of buckets documents that matched your query.
     public let total: Int
 
-
     /// List of buckets.
     public let buckets: [Bucket]
 
 
-
     init(
         total: Int,
         buckets: [Bucket]
diff --git a/Sources/AppwriteModels/Build.swift b/Sources/AppwriteModels/Build.swift
index 7f490f7..1de9b05 100644
--- a/Sources/AppwriteModels/Build.swift
+++ b/Sources/AppwriteModels/Build.swift
@@ -7,40 +7,31 @@ public class Build {
     /// Build ID.
     public let id: String
 
-
     /// The deployment that created this build.
     public let deploymentId: String
 
-
     /// The build status. There are a few different types and each one means something different. \nFailed - The deployment build has failed. More details can usually be found in buildStderr\nReady - The deployment build was successful and the deployment is ready to be deployed\nProcessing - The deployment is currently waiting to have a build triggered\nBuilding - The deployment is currently being built
     public let status: String
 
-
     /// The stdout of the build.
     public let stdout: String
 
-
     /// The stderr of the build.
     public let stderr: String
 
-
     /// The deployment creation date in ISO 8601 format.
     public let startTime: String
 
-
     /// The time the build was finished in ISO 8601 format.
     public let endTime: String
 
-
     /// The build duration in seconds.
     public let duration: Int
 
-
     /// The code size in bytes.
     public let size: Int
 
 
-
     init(
         id: String,
         deploymentId: String,
diff --git a/Sources/AppwriteModels/Collection.swift b/Sources/AppwriteModels/Collection.swift
index 2e84d4a..7ff6243 100644
--- a/Sources/AppwriteModels/Collection.swift
+++ b/Sources/AppwriteModels/Collection.swift
@@ -7,44 +7,34 @@ public class Collection {
     /// Collection ID.
     public let id: String
 
-
     /// Collection creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Collection update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Collection permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).
     public let permissions: [Any]
 
-
     /// Database ID.
     public let databaseId: String
 
-
     /// Collection name.
     public let name: String
 
-
     /// Collection enabled. Can be 'enabled' or 'disabled'. When disabled, the collection is inaccessible to users, but remains accessible to Server SDKs using API keys.
     public let enabled: Bool
 
-
     /// Whether document-level permissions are enabled. [Learn more about permissions](https://appwrite.io/docs/permissions).
     public let documentSecurity: Bool
 
-
     /// Collection attributes.
     public let attributes: [Any]
 
-
     /// Collection indexes.
     public let indexes: [Index]
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/CollectionList.swift b/Sources/AppwriteModels/CollectionList.swift
index 1abcb60..295cfa0 100644
--- a/Sources/AppwriteModels/CollectionList.swift
+++ b/Sources/AppwriteModels/CollectionList.swift
@@ -7,12 +7,10 @@ public class CollectionList {
     /// Total number of collections documents that matched your query.
     public let total: Int
 
-
     /// List of collections.
     public let collections: [Collection]
 
 
-
     init(
         total: Int,
         collections: [Collection]
diff --git a/Sources/AppwriteModels/Continent.swift b/Sources/AppwriteModels/Continent.swift
index 7eb40b9..f181353 100644
--- a/Sources/AppwriteModels/Continent.swift
+++ b/Sources/AppwriteModels/Continent.swift
@@ -7,12 +7,10 @@ public class Continent {
     /// Continent name.
     public let name: String
 
-
     /// Continent two letter code.
     public let code: String
 
 
-
     init(
         name: String,
         code: String
diff --git a/Sources/AppwriteModels/ContinentList.swift b/Sources/AppwriteModels/ContinentList.swift
index 0b60954..3cd7620 100644
--- a/Sources/AppwriteModels/ContinentList.swift
+++ b/Sources/AppwriteModels/ContinentList.swift
@@ -7,12 +7,10 @@ public class ContinentList {
     /// Total number of continents documents that matched your query.
     public let total: Int
 
-
     /// List of continents.
     public let continents: [Continent]
 
 
-
     init(
         total: Int,
         continents: [Continent]
diff --git a/Sources/AppwriteModels/Country.swift b/Sources/AppwriteModels/Country.swift
index 5a79308..3ce533b 100644
--- a/Sources/AppwriteModels/Country.swift
+++ b/Sources/AppwriteModels/Country.swift
@@ -7,12 +7,10 @@ public class Country {
     /// Country name.
     public let name: String
 
-
     /// Country two-character ISO 3166-1 alpha code.
     public let code: String
 
 
-
     init(
         name: String,
         code: String
diff --git a/Sources/AppwriteModels/CountryList.swift b/Sources/AppwriteModels/CountryList.swift
index 622ebf0..8d120bd 100644
--- a/Sources/AppwriteModels/CountryList.swift
+++ b/Sources/AppwriteModels/CountryList.swift
@@ -7,12 +7,10 @@ public class CountryList {
     /// Total number of countries documents that matched your query.
     public let total: Int
 
-
     /// List of countries.
     public let countries: [Country]
 
 
-
     init(
         total: Int,
         countries: [Country]
diff --git a/Sources/AppwriteModels/Currency.swift b/Sources/AppwriteModels/Currency.swift
index 7ec64d2..d93ce0c 100644
--- a/Sources/AppwriteModels/Currency.swift
+++ b/Sources/AppwriteModels/Currency.swift
@@ -7,32 +7,25 @@ public class Currency {
     /// Currency symbol.
     public let symbol: String
 
-
     /// Currency name.
     public let name: String
 
-
     /// Currency native symbol.
     public let symbolNative: String
 
-
     /// Number of decimal digits.
     public let decimalDigits: Int
 
-
     /// Currency digit rounding.
     public let rounding: Double
 
-
     /// Currency code in [ISO 4217-1](http://en.wikipedia.org/wiki/ISO_4217) three-character format.
     public let code: String
 
-
     /// Currency plural name
     public let namePlural: String
 
 
-
     init(
         symbol: String,
         name: String,
diff --git a/Sources/AppwriteModels/CurrencyList.swift b/Sources/AppwriteModels/CurrencyList.swift
index e42d9ad..a2e9f00 100644
--- a/Sources/AppwriteModels/CurrencyList.swift
+++ b/Sources/AppwriteModels/CurrencyList.swift
@@ -7,12 +7,10 @@ public class CurrencyList {
     /// Total number of currencies documents that matched your query.
     public let total: Int
 
-
     /// List of currencies.
     public let currencies: [Currency]
 
 
-
     init(
         total: Int,
         currencies: [Currency]
diff --git a/Sources/AppwriteModels/Database.swift b/Sources/AppwriteModels/Database.swift
index 6985155..fd97fe8 100644
--- a/Sources/AppwriteModels/Database.swift
+++ b/Sources/AppwriteModels/Database.swift
@@ -7,24 +7,19 @@ public class Database {
     /// Database ID.
     public let id: String
 
-
     /// Database name.
     public let name: String
 
-
     /// Database creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Database update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// If database is enabled. Can be 'enabled' or 'disabled'. When disabled, the database is inaccessible to users, but remains accessible to Server SDKs using API keys.
     public let enabled: Bool
 
 
-
     init(
         id: String,
         name: String,
diff --git a/Sources/AppwriteModels/DatabaseList.swift b/Sources/AppwriteModels/DatabaseList.swift
index 035211c..4932ee4 100644
--- a/Sources/AppwriteModels/DatabaseList.swift
+++ b/Sources/AppwriteModels/DatabaseList.swift
@@ -7,12 +7,10 @@ public class DatabaseList {
     /// Total number of databases documents that matched your query.
     public let total: Int
 
-
     /// List of databases.
     public let databases: [Database]
 
 
-
     init(
         total: Int,
         databases: [Database]
diff --git a/Sources/AppwriteModels/Deployment.swift b/Sources/AppwriteModels/Deployment.swift
index f2844ff..3c7f9d9 100644
--- a/Sources/AppwriteModels/Deployment.swift
+++ b/Sources/AppwriteModels/Deployment.swift
@@ -7,100 +7,76 @@ public class Deployment {
     /// Deployment ID.
     public let id: String
 
-
     /// Deployment creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Deployment update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Type of deployment.
     public let type: String
 
-
     /// Resource ID.
     public let resourceId: String
 
-
     /// Resource type.
     public let resourceType: String
 
-
     /// The entrypoint file to use to execute the deployment code.
     public let entrypoint: String
 
-
     /// The code size in bytes.
     public let size: Int
 
-
     /// The build output size in bytes.
     public let buildSize: Int
 
-
     /// The current build ID.
     public let buildId: String
 
-
     /// Whether the deployment should be automatically activated.
     public let activate: Bool
 
-
     /// The deployment status. Possible values are "processing", "building", "waiting", "ready", and "failed".
     public let status: String
 
-
     /// The build logs.
     public let buildLogs: String
 
-
     /// The current build time in seconds.
     public let buildTime: Int
 
-
     /// The name of the vcs provider repository
     public let providerRepositoryName: String
 
-
     /// The name of the vcs provider repository owner
     public let providerRepositoryOwner: String
 
-
     /// The url of the vcs provider repository
     public let providerRepositoryUrl: String
 
-
     /// The branch of the vcs repository
     public let providerBranch: String
 
-
     /// The commit hash of the vcs commit
     public let providerCommitHash: String
 
-
     /// The url of vcs commit author
     public let providerCommitAuthorUrl: String
 
-
     /// The name of vcs commit author
     public let providerCommitAuthor: String
 
-
     /// The commit message
     public let providerCommitMessage: String
 
-
     /// The url of the vcs commit
     public let providerCommitUrl: String
 
-
     /// The branch of the vcs repository
     public let providerBranchUrl: String
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/DeploymentList.swift b/Sources/AppwriteModels/DeploymentList.swift
index 098d790..aaa874d 100644
--- a/Sources/AppwriteModels/DeploymentList.swift
+++ b/Sources/AppwriteModels/DeploymentList.swift
@@ -7,12 +7,10 @@ public class DeploymentList {
     /// Total number of deployments documents that matched your query.
     public let total: Int
 
-
     /// List of deployments.
     public let deployments: [Deployment]
 
 
-
     init(
         total: Int,
         deployments: [Deployment]
diff --git a/Sources/AppwriteModels/Document.swift b/Sources/AppwriteModels/Document.swift
index 20a4f86..94069f9 100644
--- a/Sources/AppwriteModels/Document.swift
+++ b/Sources/AppwriteModels/Document.swift
@@ -7,27 +7,21 @@ public class Document<T : Codable> {
     /// Document ID.
     public let id: String
 
-
     /// Collection ID.
     public let collectionId: String
 
-
     /// Database ID.
     public let databaseId: String
 
-
     /// Document creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Document update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Document permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).
     public let permissions: [Any]
 
-
     /// Additional properties
     public let data: T
 
diff --git a/Sources/AppwriteModels/DocumentList.swift b/Sources/AppwriteModels/DocumentList.swift
index e71c5ad..4a573fe 100644
--- a/Sources/AppwriteModels/DocumentList.swift
+++ b/Sources/AppwriteModels/DocumentList.swift
@@ -7,12 +7,10 @@ public class DocumentList<T : Codable> {
     /// Total number of documents documents that matched your query.
     public let total: Int
 
-
     /// List of documents.
     public let documents: [Document<T>]
 
 
-
     init(
         total: Int,
         documents: [Document<T>]
diff --git a/Sources/AppwriteModels/Execution.swift b/Sources/AppwriteModels/Execution.swift
index 9301a8b..0f04430 100644
--- a/Sources/AppwriteModels/Execution.swift
+++ b/Sources/AppwriteModels/Execution.swift
@@ -7,72 +7,55 @@ public class Execution {
     /// Execution ID.
     public let id: String
 
-
     /// Execution creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Execution upate date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Execution roles.
     public let permissions: [Any]
 
-
     /// Function ID.
     public let functionId: String
 
-
     /// The trigger that caused the function to execute. Possible values can be: `http`, `schedule`, or `event`.
     public let trigger: String
 
-
     /// The status of the function execution. Possible values can be: `waiting`, `processing`, `completed`, or `failed`.
     public let status: String
 
-
     /// HTTP request method type.
     public let requestMethod: String
 
-
     /// HTTP request path and query.
     public let requestPath: String
 
-
     /// HTTP response headers as a key-value object. This will return only whitelisted headers. All headers are returned if execution is created as synchronous.
     public let requestHeaders: [Headers]
 
-
     /// HTTP response status code.
     public let responseStatusCode: Int
 
-
     /// HTTP response body. This will return empty unless execution is created as synchronous.
     public let responseBody: String
 
-
     /// HTTP response headers as a key-value object. This will return only whitelisted headers. All headers are returned if execution is created as synchronous.
     public let responseHeaders: [Headers]
 
-
     /// Function logs. Includes the last 4,000 characters. This will return an empty string unless the response is returned using an API key or as part of a webhook payload.
     public let logs: String
 
-
     /// Function errors. Includes the last 4,000 characters. This will return an empty string unless the response is returned using an API key or as part of a webhook payload.
     public let errors: String
 
-
     /// Function execution duration in seconds.
     public let duration: Double
 
-
     /// The scheduled time for execution. If left empty, execution will be queued immediately.
     public let scheduledAt: String?
 
 
-
     init(
         id: String,
         createdAt: String,
@@ -151,7 +134,7 @@ public class Execution {
             logs: map["logs"] as! String,
             errors: map["errors"] as! String,
             duration: map["duration"] as! Double,
-            scheduledAt: map["scheduledAt"] as? String?
+            scheduledAt: map["scheduledAt"] as? String
         )
     }
 }
diff --git a/Sources/AppwriteModels/ExecutionList.swift b/Sources/AppwriteModels/ExecutionList.swift
index ae92f73..8a502d9 100644
--- a/Sources/AppwriteModels/ExecutionList.swift
+++ b/Sources/AppwriteModels/ExecutionList.swift
@@ -7,12 +7,10 @@ public class ExecutionList {
     /// Total number of executions documents that matched your query.
     public let total: Int
 
-
     /// List of executions.
     public let executions: [Execution]
 
 
-
     init(
         total: Int,
         executions: [Execution]
diff --git a/Sources/AppwriteModels/File.swift b/Sources/AppwriteModels/File.swift
index e1669ec..04a5b89 100644
--- a/Sources/AppwriteModels/File.swift
+++ b/Sources/AppwriteModels/File.swift
@@ -7,48 +7,37 @@ public class File {
     /// File ID.
     public let id: String
 
-
     /// Bucket ID.
     public let bucketId: String
 
-
     /// File creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// File update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// File permissions. [Learn more about permissions](https://appwrite.io/docs/permissions).
     public let permissions: [Any]
 
-
     /// File name.
     public let name: String
 
-
     /// File MD5 signature.
     public let signature: String
 
-
     /// File mime type.
     public let mimeType: String
 
-
     /// File original size in bytes.
     public let sizeOriginal: Int
 
-
     /// Total number of chunks available
     public let chunksTotal: Int
 
-
     /// Total number of chunks uploaded
     public let chunksUploaded: Int
 
 
-
     init(
         id: String,
         bucketId: String,
diff --git a/Sources/AppwriteModels/FileList.swift b/Sources/AppwriteModels/FileList.swift
index 51dbd44..0d6ad88 100644
--- a/Sources/AppwriteModels/FileList.swift
+++ b/Sources/AppwriteModels/FileList.swift
@@ -7,12 +7,10 @@ public class FileList {
     /// Total number of files documents that matched your query.
     public let total: Int
 
-
     /// List of files.
     public let files: [File]
 
 
-
     init(
         total: Int,
         files: [File]
diff --git a/Sources/AppwriteModels/Function.swift b/Sources/AppwriteModels/Function.swift
index 5dda729..2eb3f97 100644
--- a/Sources/AppwriteModels/Function.swift
+++ b/Sources/AppwriteModels/Function.swift
@@ -7,100 +7,76 @@ public class Function {
     /// Function ID.
     public let id: String
 
-
     /// Function creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Function update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Execution permissions.
     public let execute: [Any]
 
-
     /// Function name.
     public let name: String
 
-
     /// Function enabled.
     public let enabled: Bool
 
-
     /// Is the function deployed with the latest configuration? This is set to false if you&#039;ve changed an environment variables, entrypoint, commands, or other settings that needs redeploy to be applied. When the value is false, redeploy the function to update it with the latest configuration.
     public let live: Bool
 
-
     /// Whether executions will be logged. When set to false, executions will not be logged, but will reduce resource used by your Appwrite project.
     public let logging: Bool
 
-
     /// Function execution runtime.
     public let runtime: String
 
-
     /// Function&#039;s active deployment ID.
     public let deployment: String
 
-
     /// Allowed permission scopes.
     public let scopes: [Any]
 
-
     /// Function variables.
     public let vars: [Variable]
 
-
     /// Function trigger events.
     public let events: [Any]
 
-
     /// Function execution schedult in CRON format.
     public let schedule: String
 
-
     /// Function execution timeout in seconds.
     public let timeout: Int
 
-
     /// The entrypoint file used to execute the deployment.
     public let entrypoint: String
 
-
     /// The build command used to build the deployment.
     public let commands: String
 
-
     /// Version of Open Runtimes used for the function.
     public let version: String
 
-
     /// Function VCS (Version Control System) installation id.
     public let installationId: String
 
-
     /// VCS (Version Control System) Repository ID
     public let providerRepositoryId: String
 
-
     /// VCS (Version Control System) branch name
     public let providerBranch: String
 
-
     /// Path to function in VCS (Version Control System) repository
     public let providerRootDirectory: String
 
-
     /// Is VCS (Version Control System) connection is in silent mode? When in silence mode, no comments will be posted on the repository pull or merge requests
     public let providerSilentMode: Bool
 
-
     /// Machine specification for builds and executions.
     public let specification: String
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/FunctionList.swift b/Sources/AppwriteModels/FunctionList.swift
index bb8c38e..b36bfc6 100644
--- a/Sources/AppwriteModels/FunctionList.swift
+++ b/Sources/AppwriteModels/FunctionList.swift
@@ -7,12 +7,10 @@ public class FunctionList {
     /// Total number of functions documents that matched your query.
     public let total: Int
 
-
     /// List of functions.
     public let functions: [Function]
 
 
-
     init(
         total: Int,
         functions: [Function]
diff --git a/Sources/AppwriteModels/Headers.swift b/Sources/AppwriteModels/Headers.swift
index aa1a95f..6f554ac 100644
--- a/Sources/AppwriteModels/Headers.swift
+++ b/Sources/AppwriteModels/Headers.swift
@@ -7,12 +7,10 @@ public class Headers {
     /// Header name.
     public let name: String
 
-
     /// Header value.
     public let value: String
 
 
-
     init(
         name: String,
         value: String
diff --git a/Sources/AppwriteModels/HealthAntivirus.swift b/Sources/AppwriteModels/HealthAntivirus.swift
index ac14223..17636de 100644
--- a/Sources/AppwriteModels/HealthAntivirus.swift
+++ b/Sources/AppwriteModels/HealthAntivirus.swift
@@ -7,12 +7,10 @@ public class HealthAntivirus {
     /// Antivirus version.
     public let version: String
 
-
     /// Antivirus status. Possible values can are: `disabled`, `offline`, `online`
     public let status: String
 
 
-
     init(
         version: String,
         status: String
diff --git a/Sources/AppwriteModels/HealthCertificate.swift b/Sources/AppwriteModels/HealthCertificate.swift
index b892537..9d7b938 100644
--- a/Sources/AppwriteModels/HealthCertificate.swift
+++ b/Sources/AppwriteModels/HealthCertificate.swift
@@ -7,28 +7,22 @@ public class HealthCertificate {
     /// Certificate name
     public let name: String
 
-
     /// Subject SN
     public let subjectSN: String
 
-
     /// Issuer organisation
     public let issuerOrganisation: String
 
-
     /// Valid from
     public let validFrom: String
 
-
     /// Valid to
     public let validTo: String
 
-
     /// Signature type SN
     public let signatureTypeSN: String
 
 
-
     init(
         name: String,
         subjectSN: String,
diff --git a/Sources/AppwriteModels/HealthQueue.swift b/Sources/AppwriteModels/HealthQueue.swift
index 894f0c4..43a7906 100644
--- a/Sources/AppwriteModels/HealthQueue.swift
+++ b/Sources/AppwriteModels/HealthQueue.swift
@@ -8,7 +8,6 @@ public class HealthQueue {
     public let size: Int
 
 
-
     init(
         size: Int
     ) {
diff --git a/Sources/AppwriteModels/HealthStatus.swift b/Sources/AppwriteModels/HealthStatus.swift
index 293e3f4..f7fb7e6 100644
--- a/Sources/AppwriteModels/HealthStatus.swift
+++ b/Sources/AppwriteModels/HealthStatus.swift
@@ -7,16 +7,13 @@ public class HealthStatus {
     /// Name of the service.
     public let name: String
 
-
     /// Duration in milliseconds how long the health check took.
     public let ping: Int
 
-
     /// Service status. Possible values can are: `pass`, `fail`
     public let status: String
 
 
-
     init(
         name: String,
         ping: Int,
diff --git a/Sources/AppwriteModels/HealthTime.swift b/Sources/AppwriteModels/HealthTime.swift
index 7b64f3b..2f4cf72 100644
--- a/Sources/AppwriteModels/HealthTime.swift
+++ b/Sources/AppwriteModels/HealthTime.swift
@@ -7,16 +7,13 @@ public class HealthTime {
     /// Current unix timestamp on trustful remote server.
     public let remoteTime: Int
 
-
     /// Current unix timestamp of local server where Appwrite runs.
     public let localTime: Int
 
-
     /// Difference of unix remote and local timestamps in milliseconds.
     public let diff: Int
 
 
-
     init(
         remoteTime: Int,
         localTime: Int,
diff --git a/Sources/AppwriteModels/Identity.swift b/Sources/AppwriteModels/Identity.swift
index 0c7d09e..fb54237 100644
--- a/Sources/AppwriteModels/Identity.swift
+++ b/Sources/AppwriteModels/Identity.swift
@@ -7,44 +7,34 @@ public class Identity {
     /// Identity ID.
     public let id: String
 
-
     /// Identity creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Identity update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// User ID.
     public let userId: String
 
-
     /// Identity Provider.
     public let provider: String
 
-
     /// ID of the User in the Identity Provider.
     public let providerUid: String
 
-
     /// Email of the User in the Identity Provider.
     public let providerEmail: String
 
-
     /// Identity Provider Access Token.
     public let providerAccessToken: String
 
-
     /// The date of when the access token expires in ISO 8601 format.
     public let providerAccessTokenExpiry: String
 
-
     /// Identity Provider Refresh Token.
     public let providerRefreshToken: String
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/IdentityList.swift b/Sources/AppwriteModels/IdentityList.swift
index a6c3477..b068f4c 100644
--- a/Sources/AppwriteModels/IdentityList.swift
+++ b/Sources/AppwriteModels/IdentityList.swift
@@ -7,12 +7,10 @@ public class IdentityList {
     /// Total number of identities documents that matched your query.
     public let total: Int
 
-
     /// List of identities.
     public let identities: [Identity]
 
 
-
     init(
         total: Int,
         identities: [Identity]
diff --git a/Sources/AppwriteModels/Index.swift b/Sources/AppwriteModels/Index.swift
index 784e368..c878e39 100644
--- a/Sources/AppwriteModels/Index.swift
+++ b/Sources/AppwriteModels/Index.swift
@@ -7,28 +7,22 @@ public class Index {
     /// Index Key.
     public let key: String
 
-
     /// Index type.
     public let type: String
 
-
     /// Index status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
     public let status: String
 
-
     /// Error message. Displays error generated on failure of creating or deleting an index.
     public let error: String
 
-
     /// Index attributes.
     public let attributes: [Any]
 
-
     /// Index orders.
     public let orders: [Any]?
 
 
-
     init(
         key: String,
         type: String,
@@ -63,7 +57,7 @@ public class Index {
             status: map["status"] as! String,
             error: map["error"] as! String,
             attributes: map["attributes"] as! [Any],
-            orders: map["orders"] as? [Any]?
+            orders: map["orders"] as? [Any]
         )
     }
 }
diff --git a/Sources/AppwriteModels/IndexList.swift b/Sources/AppwriteModels/IndexList.swift
index 8206078..6ca5ae9 100644
--- a/Sources/AppwriteModels/IndexList.swift
+++ b/Sources/AppwriteModels/IndexList.swift
@@ -7,12 +7,10 @@ public class IndexList {
     /// Total number of indexes documents that matched your query.
     public let total: Int
 
-
     /// List of indexes.
     public let indexes: [Index]
 
 
-
     init(
         total: Int,
         indexes: [Index]
diff --git a/Sources/AppwriteModels/Jwt.swift b/Sources/AppwriteModels/Jwt.swift
index 902f5b2..5778435 100644
--- a/Sources/AppwriteModels/Jwt.swift
+++ b/Sources/AppwriteModels/Jwt.swift
@@ -8,7 +8,6 @@ public class Jwt {
     public let jwt: String
 
 
-
     init(
         jwt: String
     ) {
diff --git a/Sources/AppwriteModels/Language.swift b/Sources/AppwriteModels/Language.swift
index 3111149..f385d5a 100644
--- a/Sources/AppwriteModels/Language.swift
+++ b/Sources/AppwriteModels/Language.swift
@@ -7,16 +7,13 @@ public class Language {
     /// Language name.
     public let name: String
 
-
     /// Language two-character ISO 639-1 codes.
     public let code: String
 
-
     /// Language native name.
     public let nativeName: String
 
 
-
     init(
         name: String,
         code: String,
diff --git a/Sources/AppwriteModels/LanguageList.swift b/Sources/AppwriteModels/LanguageList.swift
index acba750..b4515e3 100644
--- a/Sources/AppwriteModels/LanguageList.swift
+++ b/Sources/AppwriteModels/LanguageList.swift
@@ -7,12 +7,10 @@ public class LanguageList {
     /// Total number of languages documents that matched your query.
     public let total: Int
 
-
     /// List of languages.
     public let languages: [Language]
 
 
-
     init(
         total: Int,
         languages: [Language]
diff --git a/Sources/AppwriteModels/Locale.swift b/Sources/AppwriteModels/Locale.swift
index 2f4d046..7445776 100644
--- a/Sources/AppwriteModels/Locale.swift
+++ b/Sources/AppwriteModels/Locale.swift
@@ -7,32 +7,25 @@ public class Locale {
     /// User IP address.
     public let ip: String
 
-
     /// Country code in [ISO 3166-1](http://en.wikipedia.org/wiki/ISO_3166-1) two-character format
     public let countryCode: String
 
-
     /// Country name. This field support localization.
     public let country: String
 
-
     /// Continent code. A two character continent code &quot;AF&quot; for Africa, &quot;AN&quot; for Antarctica, &quot;AS&quot; for Asia, &quot;EU&quot; for Europe, &quot;NA&quot; for North America, &quot;OC&quot; for Oceania, and &quot;SA&quot; for South America.
     public let continentCode: String
 
-
     /// Continent name. This field support localization.
     public let continent: String
 
-
     /// True if country is part of the European Union.
     public let eu: Bool
 
-
     /// Currency code in [ISO 4217-1](http://en.wikipedia.org/wiki/ISO_4217) three-character format
     public let currency: String
 
 
-
     init(
         ip: String,
         countryCode: String,
diff --git a/Sources/AppwriteModels/LocaleCode.swift b/Sources/AppwriteModels/LocaleCode.swift
index 2d6185e..8e561c7 100644
--- a/Sources/AppwriteModels/LocaleCode.swift
+++ b/Sources/AppwriteModels/LocaleCode.swift
@@ -7,12 +7,10 @@ public class LocaleCode {
     /// Locale codes in [ISO 639-1](https://en.wikipedia.org/wiki/List_of_ISO_639-1_codes)
     public let code: String
 
-
     /// Locale name
     public let name: String
 
 
-
     init(
         code: String,
         name: String
diff --git a/Sources/AppwriteModels/LocaleCodeList.swift b/Sources/AppwriteModels/LocaleCodeList.swift
index dca47d8..895ef7d 100644
--- a/Sources/AppwriteModels/LocaleCodeList.swift
+++ b/Sources/AppwriteModels/LocaleCodeList.swift
@@ -7,12 +7,10 @@ public class LocaleCodeList {
     /// Total number of localeCodes documents that matched your query.
     public let total: Int
 
-
     /// List of localeCodes.
     public let localeCodes: [LocaleCode]
 
 
-
     init(
         total: Int,
         localeCodes: [LocaleCode]
diff --git a/Sources/AppwriteModels/Log.swift b/Sources/AppwriteModels/Log.swift
index bf0135e..df5464d 100644
--- a/Sources/AppwriteModels/Log.swift
+++ b/Sources/AppwriteModels/Log.swift
@@ -7,88 +7,67 @@ public class Log {
     /// Event name.
     public let event: String
 
-
     /// User ID.
     public let userId: String
 
-
     /// User Email.
     public let userEmail: String
 
-
     /// User Name.
     public let userName: String
 
-
     /// API mode when event triggered.
     public let mode: String
 
-
     /// IP session in use when the session was created.
     public let ip: String
 
-
     /// Log creation date in ISO 8601 format.
     public let time: String
 
-
     /// Operating system code name. View list of [available options](https://github.com/appwrite/appwrite/blob/master/docs/lists/os.json).
     public let osCode: String
 
-
     /// Operating system name.
     public let osName: String
 
-
     /// Operating system version.
     public let osVersion: String
 
-
     /// Client type.
     public let clientType: String
 
-
     /// Client code name. View list of [available options](https://github.com/appwrite/appwrite/blob/master/docs/lists/clients.json).
     public let clientCode: String
 
-
     /// Client name.
     public let clientName: String
 
-
     /// Client version.
     public let clientVersion: String
 
-
     /// Client engine name.
     public let clientEngine: String
 
-
     /// Client engine name.
     public let clientEngineVersion: String
 
-
     /// Device name.
     public let deviceName: String
 
-
     /// Device brand name.
     public let deviceBrand: String
 
-
     /// Device model name.
     public let deviceModel: String
 
-
     /// Country two-character ISO 3166-1 alpha code.
     public let countryCode: String
 
-
     /// Country name.
     public let countryName: String
 
 
-
     init(
         event: String,
         userId: String,
diff --git a/Sources/AppwriteModels/LogList.swift b/Sources/AppwriteModels/LogList.swift
index 241f775..2f99674 100644
--- a/Sources/AppwriteModels/LogList.swift
+++ b/Sources/AppwriteModels/LogList.swift
@@ -7,12 +7,10 @@ public class LogList {
     /// Total number of logs documents that matched your query.
     public let total: Int
 
-
     /// List of logs.
     public let logs: [Log]
 
 
-
     init(
         total: Int,
         logs: [Log]
diff --git a/Sources/AppwriteModels/Membership.swift b/Sources/AppwriteModels/Membership.swift
index 176b746..55fb199 100644
--- a/Sources/AppwriteModels/Membership.swift
+++ b/Sources/AppwriteModels/Membership.swift
@@ -7,56 +7,43 @@ public class Membership {
     /// Membership ID.
     public let id: String
 
-
     /// Membership creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Membership update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// User ID.
     public let userId: String
 
-
     /// User name.
     public let userName: String
 
-
     /// User email address.
     public let userEmail: String
 
-
     /// Team ID.
     public let teamId: String
 
-
     /// Team name.
     public let teamName: String
 
-
     /// Date, the user has been invited to join the team in ISO 8601 format.
     public let invited: String
 
-
     /// Date, the user has accepted the invitation to join the team in ISO 8601 format.
     public let joined: String
 
-
     /// User confirmation status, true if the user has joined the team or false otherwise.
     public let confirm: Bool
 
-
     /// Multi factor authentication status, true if the user has MFA enabled or false otherwise.
     public let mfa: Bool
 
-
     /// User list of roles
     public let roles: [Any]
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/MembershipList.swift b/Sources/AppwriteModels/MembershipList.swift
index 5218b20..f27cc99 100644
--- a/Sources/AppwriteModels/MembershipList.swift
+++ b/Sources/AppwriteModels/MembershipList.swift
@@ -7,12 +7,10 @@ public class MembershipList {
     /// Total number of memberships documents that matched your query.
     public let total: Int
 
-
     /// List of memberships.
     public let memberships: [Membership]
 
 
-
     init(
         total: Int,
         memberships: [Membership]
diff --git a/Sources/AppwriteModels/Message.swift b/Sources/AppwriteModels/Message.swift
index 382d98d..32e8897 100644
--- a/Sources/AppwriteModels/Message.swift
+++ b/Sources/AppwriteModels/Message.swift
@@ -7,56 +7,43 @@ public class Message {
     /// Message ID.
     public let id: String
 
-
     /// Message creation time in ISO 8601 format.
     public let createdAt: String
 
-
     /// Message update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Message provider type.
     public let providerType: String
 
-
     /// Topic IDs set as recipients.
     public let topics: [Any]
 
-
     /// User IDs set as recipients.
     public let users: [Any]
 
-
     /// Target IDs set as recipients.
     public let targets: [Any]
 
-
     /// The scheduled time for message.
     public let scheduledAt: String?
 
-
     /// The time when the message was delivered.
     public let deliveredAt: String?
 
-
     /// Delivery errors if any.
     public let deliveryErrors: [Any]?
 
-
     /// Number of recipients the message was delivered to.
     public let deliveredTotal: Int
 
-
     /// Data of the message.
     public let data: Any
 
-
     /// Status of delivery.
     public let status: String
 
 
-
     init(
         id: String,
         createdAt: String,
@@ -114,9 +101,9 @@ public class Message {
             topics: map["topics"] as! [Any],
             users: map["users"] as! [Any],
             targets: map["targets"] as! [Any],
-            scheduledAt: map["scheduledAt"] as? String?,
-            deliveredAt: map["deliveredAt"] as? String?,
-            deliveryErrors: map["deliveryErrors"] as? [Any]?,
+            scheduledAt: map["scheduledAt"] as? String,
+            deliveredAt: map["deliveredAt"] as? String,
+            deliveryErrors: map["deliveryErrors"] as? [Any],
             deliveredTotal: map["deliveredTotal"] as! Int,
             data: map["data"] as! Any,
             status: map["status"] as! String
diff --git a/Sources/AppwriteModels/MessageList.swift b/Sources/AppwriteModels/MessageList.swift
index e4489cb..c64f376 100644
--- a/Sources/AppwriteModels/MessageList.swift
+++ b/Sources/AppwriteModels/MessageList.swift
@@ -7,12 +7,10 @@ public class MessageList {
     /// Total number of messages documents that matched your query.
     public let total: Int
 
-
     /// List of messages.
     public let messages: [Message]
 
 
-
     init(
         total: Int,
         messages: [Message]
diff --git a/Sources/AppwriteModels/MfaChallenge.swift b/Sources/AppwriteModels/MfaChallenge.swift
index 6d7481b..5a1e874 100644
--- a/Sources/AppwriteModels/MfaChallenge.swift
+++ b/Sources/AppwriteModels/MfaChallenge.swift
@@ -7,20 +7,16 @@ public class MfaChallenge {
     /// Token ID.
     public let id: String
 
-
     /// Token creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// User ID.
     public let userId: String
 
-
     /// Token expiration date in ISO 8601 format.
     public let expire: String
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/MfaFactors.swift b/Sources/AppwriteModels/MfaFactors.swift
index 88adf5e..716c055 100644
--- a/Sources/AppwriteModels/MfaFactors.swift
+++ b/Sources/AppwriteModels/MfaFactors.swift
@@ -7,20 +7,16 @@ public class MfaFactors {
     /// Can TOTP be used for MFA challenge for this account.
     public let totp: Bool
 
-
     /// Can phone (SMS) be used for MFA challenge for this account.
     public let phone: Bool
 
-
     /// Can email be used for MFA challenge for this account.
     public let email: Bool
 
-
     /// Can recovery code be used for MFA challenge for this account.
     public let recoveryCode: Bool
 
 
-
     init(
         totp: Bool,
         phone: Bool,
diff --git a/Sources/AppwriteModels/MfaRecoveryCodes.swift b/Sources/AppwriteModels/MfaRecoveryCodes.swift
index 8b57721..8dd063b 100644
--- a/Sources/AppwriteModels/MfaRecoveryCodes.swift
+++ b/Sources/AppwriteModels/MfaRecoveryCodes.swift
@@ -8,7 +8,6 @@ public class MfaRecoveryCodes {
     public let recoveryCodes: [Any]
 
 
-
     init(
         recoveryCodes: [Any]
     ) {
diff --git a/Sources/AppwriteModels/MfaType.swift b/Sources/AppwriteModels/MfaType.swift
index 80c3526..503134f 100644
--- a/Sources/AppwriteModels/MfaType.swift
+++ b/Sources/AppwriteModels/MfaType.swift
@@ -7,12 +7,10 @@ public class MfaType {
     /// Secret token used for TOTP factor.
     public let secret: String
 
-
     /// URI for authenticator apps.
     public let uri: String
 
 
-
     init(
         secret: String,
         uri: String
diff --git a/Sources/AppwriteModels/Phone.swift b/Sources/AppwriteModels/Phone.swift
index a1bb096..2e113b4 100644
--- a/Sources/AppwriteModels/Phone.swift
+++ b/Sources/AppwriteModels/Phone.swift
@@ -7,16 +7,13 @@ public class Phone {
     /// Phone code.
     public let code: String
 
-
     /// Country two-character ISO 3166-1 alpha code.
     public let countryCode: String
 
-
     /// Country name.
     public let countryName: String
 
 
-
     init(
         code: String,
         countryCode: String,
diff --git a/Sources/AppwriteModels/PhoneList.swift b/Sources/AppwriteModels/PhoneList.swift
index 6918afa..38a5a6f 100644
--- a/Sources/AppwriteModels/PhoneList.swift
+++ b/Sources/AppwriteModels/PhoneList.swift
@@ -7,12 +7,10 @@ public class PhoneList {
     /// Total number of phones documents that matched your query.
     public let total: Int
 
-
     /// List of phones.
     public let phones: [Phone]
 
 
-
     init(
         total: Int,
         phones: [Phone]
diff --git a/Sources/AppwriteModels/Provider.swift b/Sources/AppwriteModels/Provider.swift
index d5545a6..4a0e46c 100644
--- a/Sources/AppwriteModels/Provider.swift
+++ b/Sources/AppwriteModels/Provider.swift
@@ -7,40 +7,31 @@ public class Provider {
     /// Provider ID.
     public let id: String
 
-
     /// Provider creation time in ISO 8601 format.
     public let createdAt: String
 
-
     /// Provider update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// The name for the provider instance.
     public let name: String
 
-
     /// The name of the provider service.
     public let provider: String
 
-
     /// Is provider enabled?
     public let enabled: Bool
 
-
     /// Type of provider.
     public let type: String
 
-
     /// Provider credentials.
     public let credentials: Any
 
-
     /// Provider options.
     public let options: Any?
 
 
-
     init(
         id: String,
         createdAt: String,
@@ -87,7 +78,7 @@ public class Provider {
             enabled: map["enabled"] as! Bool,
             type: map["type"] as! String,
             credentials: map["credentials"] as! Any,
-            options: map["options"] as? Any?
+            options: map["options"] as? Any
         )
     }
 }
diff --git a/Sources/AppwriteModels/ProviderList.swift b/Sources/AppwriteModels/ProviderList.swift
index 6e458a5..16e2293 100644
--- a/Sources/AppwriteModels/ProviderList.swift
+++ b/Sources/AppwriteModels/ProviderList.swift
@@ -7,12 +7,10 @@ public class ProviderList {
     /// Total number of providers documents that matched your query.
     public let total: Int
 
-
     /// List of providers.
     public let providers: [Provider]
 
 
-
     init(
         total: Int,
         providers: [Provider]
diff --git a/Sources/AppwriteModels/Runtime.swift b/Sources/AppwriteModels/Runtime.swift
index 64dc92f..66906e1 100644
--- a/Sources/AppwriteModels/Runtime.swift
+++ b/Sources/AppwriteModels/Runtime.swift
@@ -7,36 +7,28 @@ public class Runtime {
     /// Runtime ID.
     public let id: String
 
-
     /// Parent runtime key.
     public let key: String
 
-
     /// Runtime Name.
     public let name: String
 
-
     /// Runtime version.
     public let version: String
 
-
     /// Base Docker image used to build the runtime.
     public let base: String
 
-
     /// Image name of Docker Hub.
     public let image: String
 
-
     /// Name of the logo image.
     public let logo: String
 
-
     /// List of supported architectures.
     public let supports: [Any]
 
 
-
     init(
         id: String,
         key: String,
diff --git a/Sources/AppwriteModels/RuntimeList.swift b/Sources/AppwriteModels/RuntimeList.swift
index 2a2859e..4cd4153 100644
--- a/Sources/AppwriteModels/RuntimeList.swift
+++ b/Sources/AppwriteModels/RuntimeList.swift
@@ -7,12 +7,10 @@ public class RuntimeList {
     /// Total number of runtimes documents that matched your query.
     public let total: Int
 
-
     /// List of runtimes.
     public let runtimes: [Runtime]
 
 
-
     init(
         total: Int,
         runtimes: [Runtime]
diff --git a/Sources/AppwriteModels/Session.swift b/Sources/AppwriteModels/Session.swift
index c6aca5b..7214468 100644
--- a/Sources/AppwriteModels/Session.swift
+++ b/Sources/AppwriteModels/Session.swift
@@ -7,120 +7,91 @@ public class Session {
     /// Session ID.
     public let id: String
 
-
     /// Session creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Session update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// User ID.
     public let userId: String
 
-
     /// Session expiration date in ISO 8601 format.
     public let expire: String
 
-
     /// Session Provider.
     public let provider: String
 
-
     /// Session Provider User ID.
     public let providerUid: String
 
-
     /// Session Provider Access Token.
     public let providerAccessToken: String
 
-
     /// The date of when the access token expires in ISO 8601 format.
     public let providerAccessTokenExpiry: String
 
-
     /// Session Provider Refresh Token.
     public let providerRefreshToken: String
 
-
     /// IP in use when the session was created.
     public let ip: String
 
-
     /// Operating system code name. View list of [available options](https://github.com/appwrite/appwrite/blob/master/docs/lists/os.json).
     public let osCode: String
 
-
     /// Operating system name.
     public let osName: String
 
-
     /// Operating system version.
     public let osVersion: String
 
-
     /// Client type.
     public let clientType: String
 
-
     /// Client code name. View list of [available options](https://github.com/appwrite/appwrite/blob/master/docs/lists/clients.json).
     public let clientCode: String
 
-
     /// Client name.
     public let clientName: String
 
-
     /// Client version.
     public let clientVersion: String
 
-
     /// Client engine name.
     public let clientEngine: String
 
-
     /// Client engine name.
     public let clientEngineVersion: String
 
-
     /// Device name.
     public let deviceName: String
 
-
     /// Device brand name.
     public let deviceBrand: String
 
-
     /// Device model name.
     public let deviceModel: String
 
-
     /// Country two-character ISO 3166-1 alpha code.
     public let countryCode: String
 
-
     /// Country name.
     public let countryName: String
 
-
     /// Returns true if this the current user session.
     public let current: Bool
 
-
     /// Returns a list of active session factors.
     public let factors: [Any]
 
-
     /// Secret used to authenticate the user. Only included if the request was made with an API key
     public let secret: String
 
-
     /// Most recent date in ISO 8601 format when the session successfully passed MFA challenge.
     public let mfaUpdatedAt: String
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/SessionList.swift b/Sources/AppwriteModels/SessionList.swift
index c526af9..409f72a 100644
--- a/Sources/AppwriteModels/SessionList.swift
+++ b/Sources/AppwriteModels/SessionList.swift
@@ -7,12 +7,10 @@ public class SessionList {
     /// Total number of sessions documents that matched your query.
     public let total: Int
 
-
     /// List of sessions.
     public let sessions: [Session]
 
 
-
     init(
         total: Int,
         sessions: [Session]
diff --git a/Sources/AppwriteModels/Specification.swift b/Sources/AppwriteModels/Specification.swift
index 7a82ce2..fd9e49b 100644
--- a/Sources/AppwriteModels/Specification.swift
+++ b/Sources/AppwriteModels/Specification.swift
@@ -7,20 +7,16 @@ public class Specification {
     /// Memory size in MB.
     public let memory: Int
 
-
     /// Number of CPUs.
     public let cpus: Double
 
-
     /// Is size enabled.
     public let enabled: Bool
 
-
     /// Size slug.
     public let slug: String
 
 
-
     init(
         memory: Int,
         cpus: Double,
diff --git a/Sources/AppwriteModels/SpecificationList.swift b/Sources/AppwriteModels/SpecificationList.swift
index 462d6c0..fbe93ca 100644
--- a/Sources/AppwriteModels/SpecificationList.swift
+++ b/Sources/AppwriteModels/SpecificationList.swift
@@ -7,12 +7,10 @@ public class SpecificationList {
     /// Total number of specifications documents that matched your query.
     public let total: Int
 
-
     /// List of specifications.
     public let specifications: [Specification]
 
 
-
     init(
         total: Int,
         specifications: [Specification]
diff --git a/Sources/AppwriteModels/Subscriber.swift b/Sources/AppwriteModels/Subscriber.swift
index f990bb4..5ab202d 100644
--- a/Sources/AppwriteModels/Subscriber.swift
+++ b/Sources/AppwriteModels/Subscriber.swift
@@ -7,40 +7,31 @@ public class Subscriber {
     /// Subscriber ID.
     public let id: String
 
-
     /// Subscriber creation time in ISO 8601 format.
     public let createdAt: String
 
-
     /// Subscriber update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Target ID.
     public let targetId: String
 
-
     /// Target.
     public let target: Target
 
-
     /// Topic ID.
     public let userId: String
 
-
     /// User Name.
     public let userName: String
 
-
     /// Topic ID.
     public let topicId: String
 
-
     /// The target provider type. Can be one of the following: `email`, `sms` or `push`.
     public let providerType: String
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/SubscriberList.swift b/Sources/AppwriteModels/SubscriberList.swift
index f133c3f..5d38226 100644
--- a/Sources/AppwriteModels/SubscriberList.swift
+++ b/Sources/AppwriteModels/SubscriberList.swift
@@ -7,12 +7,10 @@ public class SubscriberList {
     /// Total number of subscribers documents that matched your query.
     public let total: Int
 
-
     /// List of subscribers.
     public let subscribers: [Subscriber]
 
 
-
     init(
         total: Int,
         subscribers: [Subscriber]
diff --git a/Sources/AppwriteModels/Target.swift b/Sources/AppwriteModels/Target.swift
index eaaf267..087eca6 100644
--- a/Sources/AppwriteModels/Target.swift
+++ b/Sources/AppwriteModels/Target.swift
@@ -7,36 +7,28 @@ public class Target {
     /// Target ID.
     public let id: String
 
-
     /// Target creation time in ISO 8601 format.
     public let createdAt: String
 
-
     /// Target update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Target Name.
     public let name: String
 
-
     /// User ID.
     public let userId: String
 
-
     /// Provider ID.
     public let providerId: String?
 
-
     /// The target provider type. Can be one of the following: `email`, `sms` or `push`.
     public let providerType: String
 
-
     /// The target identifier.
     public let identifier: String
 
 
-
     init(
         id: String,
         createdAt: String,
@@ -77,7 +69,7 @@ public class Target {
             updatedAt: map["$updatedAt"] as! String,
             name: map["name"] as! String,
             userId: map["userId"] as! String,
-            providerId: map["providerId"] as? String?,
+            providerId: map["providerId"] as? String,
             providerType: map["providerType"] as! String,
             identifier: map["identifier"] as! String
         )
diff --git a/Sources/AppwriteModels/TargetList.swift b/Sources/AppwriteModels/TargetList.swift
index c2ba57b..dadd887 100644
--- a/Sources/AppwriteModels/TargetList.swift
+++ b/Sources/AppwriteModels/TargetList.swift
@@ -7,12 +7,10 @@ public class TargetList {
     /// Total number of targets documents that matched your query.
     public let total: Int
 
-
     /// List of targets.
     public let targets: [Target]
 
 
-
     init(
         total: Int,
         targets: [Target]
diff --git a/Sources/AppwriteModels/Team.swift b/Sources/AppwriteModels/Team.swift
index 9830c39..a44c305 100644
--- a/Sources/AppwriteModels/Team.swift
+++ b/Sources/AppwriteModels/Team.swift
@@ -7,28 +7,22 @@ public class Team<T : Codable> {
     /// Team ID.
     public let id: String
 
-
     /// Team creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Team update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Team name.
     public let name: String
 
-
     /// Total number of team members.
     public let total: Int
 
-
     /// Team preferences as a key-value object
     public let prefs: Preferences<T>
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/TeamList.swift b/Sources/AppwriteModels/TeamList.swift
index 2934a13..ec7e0bd 100644
--- a/Sources/AppwriteModels/TeamList.swift
+++ b/Sources/AppwriteModels/TeamList.swift
@@ -7,12 +7,10 @@ public class TeamList<T : Codable> {
     /// Total number of teams documents that matched your query.
     public let total: Int
 
-
     /// List of teams.
     public let teams: [Team<T>]
 
 
-
     init(
         total: Int,
         teams: [Team<T>]
diff --git a/Sources/AppwriteModels/Token.swift b/Sources/AppwriteModels/Token.swift
index 5facdef..31d4b4a 100644
--- a/Sources/AppwriteModels/Token.swift
+++ b/Sources/AppwriteModels/Token.swift
@@ -7,28 +7,22 @@ public class Token {
     /// Token ID.
     public let id: String
 
-
     /// Token creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// User ID.
     public let userId: String
 
-
     /// Token secret key. This will return an empty string unless the response is returned using an API key or as part of a webhook payload.
     public let secret: String
 
-
     /// Token expiration date in ISO 8601 format.
     public let expire: String
 
-
     /// Security phrase of a token. Empty if security phrase was not requested when creating a token. It includes randomly generated phrase which is also sent in the external resource such as email.
     public let phrase: String
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/Topic.swift b/Sources/AppwriteModels/Topic.swift
index bb4d44b..c8398e6 100644
--- a/Sources/AppwriteModels/Topic.swift
+++ b/Sources/AppwriteModels/Topic.swift
@@ -7,36 +7,28 @@ public class Topic {
     /// Topic ID.
     public let id: String
 
-
     /// Topic creation time in ISO 8601 format.
     public let createdAt: String
 
-
     /// Topic update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// The name of the topic.
     public let name: String
 
-
     /// Total count of email subscribers subscribed to the topic.
     public let emailTotal: Int
 
-
     /// Total count of SMS subscribers subscribed to the topic.
     public let smsTotal: Int
 
-
     /// Total count of push subscribers subscribed to the topic.
     public let pushTotal: Int
 
-
     /// Subscribe permissions.
     public let subscribe: [Any]
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/TopicList.swift b/Sources/AppwriteModels/TopicList.swift
index 7c51e8b..b7d35a0 100644
--- a/Sources/AppwriteModels/TopicList.swift
+++ b/Sources/AppwriteModels/TopicList.swift
@@ -7,12 +7,10 @@ public class TopicList {
     /// Total number of topics documents that matched your query.
     public let total: Int
 
-
     /// List of topics.
     public let topics: [Topic]
 
 
-
     init(
         total: Int,
         topics: [Topic]
diff --git a/Sources/AppwriteModels/User.swift b/Sources/AppwriteModels/User.swift
index a087357..d12c343 100644
--- a/Sources/AppwriteModels/User.swift
+++ b/Sources/AppwriteModels/User.swift
@@ -7,80 +7,61 @@ public class User<T : Codable> {
     /// User ID.
     public let id: String
 
-
     /// User creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// User update date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// User name.
     public let name: String
 
-
     /// Hashed user password.
     public let password: String?
 
-
     /// Password hashing algorithm.
     public let hash: String?
 
-
     /// Password hashing algorithm configuration.
     public let hashOptions: Any?
 
-
     /// User registration date in ISO 8601 format.
     public let registration: String
 
-
     /// User status. Pass `true` for enabled and `false` for disabled.
     public let status: Bool
 
-
     /// Labels for the user.
     public let labels: [Any]
 
-
     /// Password update time in ISO 8601 format.
     public let passwordUpdate: String
 
-
     /// User email address.
     public let email: String
 
-
     /// User phone number in E.164 format.
     public let phone: String
 
-
     /// Email verification status.
     public let emailVerification: Bool
 
-
     /// Phone verification status.
     public let phoneVerification: Bool
 
-
     /// Multi factor authentication status.
     public let mfa: Bool
 
-
     /// User preferences as a key-value object
     public let prefs: Preferences<T>
 
-
     /// A user-owned message receiver. A single user may have multiple e.g. emails, phones, and a browser. Each target is registered with a single provider.
     public let targets: [Target]
 
-
     /// Most recent access date in ISO 8601 format. This attribute is only updated again after 24 hours.
     public let accessedAt: String
 
 
-
     init(
         id: String,
         createdAt: String,
@@ -153,9 +134,9 @@ public class User<T : Codable> {
             createdAt: map["$createdAt"] as! String,
             updatedAt: map["$updatedAt"] as! String,
             name: map["name"] as! String,
-            password: map["password"] as? String?,
-            hash: map["hash"] as? String?,
-            hashOptions: map["hashOptions"] as? Any?,
+            password: map["password"] as? String,
+            hash: map["hash"] as? String,
+            hashOptions: map["hashOptions"] as? Any,
             registration: map["registration"] as! String,
             status: map["status"] as! Bool,
             labels: map["labels"] as! [Any],
diff --git a/Sources/AppwriteModels/UserList.swift b/Sources/AppwriteModels/UserList.swift
index 8a62740..44eebb2 100644
--- a/Sources/AppwriteModels/UserList.swift
+++ b/Sources/AppwriteModels/UserList.swift
@@ -7,12 +7,10 @@ public class UserList<T : Codable> {
     /// Total number of users documents that matched your query.
     public let total: Int
 
-
     /// List of users.
     public let users: [User<T>]
 
 
-
     init(
         total: Int,
         users: [User<T>]
diff --git a/Sources/AppwriteModels/Variable.swift b/Sources/AppwriteModels/Variable.swift
index 261f8d6..63934d1 100644
--- a/Sources/AppwriteModels/Variable.swift
+++ b/Sources/AppwriteModels/Variable.swift
@@ -7,32 +7,25 @@ public class Variable {
     /// Variable ID.
     public let id: String
 
-
     /// Variable creation date in ISO 8601 format.
     public let createdAt: String
 
-
     /// Variable creation date in ISO 8601 format.
     public let updatedAt: String
 
-
     /// Variable key.
     public let key: String
 
-
     /// Variable value.
     public let value: String
 
-
     /// Service to which the variable belongs. Possible values are &quot;project&quot;, &quot;function&quot;
     public let resourceType: String
 
-
     /// ID of resource to which the variable belongs. If resourceType is &quot;project&quot;, it is empty. If resourceType is &quot;function&quot;, it is ID of the function.
     public let resourceId: String
 
 
-
     init(
         id: String,
         createdAt: String,
diff --git a/Sources/AppwriteModels/VariableList.swift b/Sources/AppwriteModels/VariableList.swift
index 01bfa3b..86c6ddc 100644
--- a/Sources/AppwriteModels/VariableList.swift
+++ b/Sources/AppwriteModels/VariableList.swift
@@ -7,12 +7,10 @@ public class VariableList {
     /// Total number of variables documents that matched your query.
     public let total: Int
 
-
     /// List of variables.
     public let variables: [Variable]
 
 
-
     init(
         total: Int,
         variables: [Variable]
diff --git a/docs/examples/databases/update-boolean-attribute.md b/docs/examples/databases/update-boolean-attribute.md
index c22cccd..e40da1a 100644
--- a/docs/examples/databases/update-boolean-attribute.md
+++ b/docs/examples/databases/update-boolean-attribute.md
@@ -12,6 +12,7 @@ let attributeBoolean = try await databases.updateBooleanAttribute(
     collectionId: "<COLLECTION_ID>",
     key: "",
     required: false,
-    default: false
+    default: false,
+    newKey: "" // optional
 )
 
diff --git a/docs/examples/databases/update-datetime-attribute.md b/docs/examples/databases/update-datetime-attribute.md
index fafcf40..a7728d2 100644
--- a/docs/examples/databases/update-datetime-attribute.md
+++ b/docs/examples/databases/update-datetime-attribute.md
@@ -12,6 +12,7 @@ let attributeDatetime = try await databases.updateDatetimeAttribute(
     collectionId: "<COLLECTION_ID>",
     key: "",
     required: false,
-    default: ""
+    default: "",
+    newKey: "" // optional
 )
 
diff --git a/docs/examples/databases/update-email-attribute.md b/docs/examples/databases/update-email-attribute.md
index 8a5c3ce..137ca78 100644
--- a/docs/examples/databases/update-email-attribute.md
+++ b/docs/examples/databases/update-email-attribute.md
@@ -12,6 +12,7 @@ let attributeEmail = try await databases.updateEmailAttribute(
     collectionId: "<COLLECTION_ID>",
     key: "",
     required: false,
-    default: "email@example.com"
+    default: "email@example.com",
+    newKey: "" // optional
 )
 
diff --git a/docs/examples/databases/update-enum-attribute.md b/docs/examples/databases/update-enum-attribute.md
index 1c43d84..bf7df6f 100644
--- a/docs/examples/databases/update-enum-attribute.md
+++ b/docs/examples/databases/update-enum-attribute.md
@@ -13,6 +13,7 @@ let attributeEnum = try await databases.updateEnumAttribute(
     key: "",
     elements: [],
     required: false,
-    default: "<DEFAULT>"
+    default: "<DEFAULT>",
+    newKey: "" // optional
 )
 
diff --git a/docs/examples/databases/update-float-attribute.md b/docs/examples/databases/update-float-attribute.md
index d869c81..54a6065 100644
--- a/docs/examples/databases/update-float-attribute.md
+++ b/docs/examples/databases/update-float-attribute.md
@@ -14,6 +14,7 @@ let attributeFloat = try await databases.updateFloatAttribute(
     required: false,
     min: 0,
     max: 0,
-    default: 0
+    default: 0,
+    newKey: "" // optional
 )
 
diff --git a/docs/examples/databases/update-integer-attribute.md b/docs/examples/databases/update-integer-attribute.md
index 08391b6..0a8d545 100644
--- a/docs/examples/databases/update-integer-attribute.md
+++ b/docs/examples/databases/update-integer-attribute.md
@@ -14,6 +14,7 @@ let attributeInteger = try await databases.updateIntegerAttribute(
     required: false,
     min: 0,
     max: 0,
-    default: 0
+    default: 0,
+    newKey: "" // optional
 )
 
diff --git a/docs/examples/databases/update-ip-attribute.md b/docs/examples/databases/update-ip-attribute.md
index 69eb799..2b41096 100644
--- a/docs/examples/databases/update-ip-attribute.md
+++ b/docs/examples/databases/update-ip-attribute.md
@@ -12,6 +12,7 @@ let attributeIp = try await databases.updateIpAttribute(
     collectionId: "<COLLECTION_ID>",
     key: "",
     required: false,
-    default: ""
+    default: "",
+    newKey: "" // optional
 )
 
diff --git a/docs/examples/databases/update-relationship-attribute.md b/docs/examples/databases/update-relationship-attribute.md
index 31bd76d..8faa5ae 100644
--- a/docs/examples/databases/update-relationship-attribute.md
+++ b/docs/examples/databases/update-relationship-attribute.md
@@ -12,6 +12,7 @@ let attributeRelationship = try await databases.updateRelationshipAttribute(
     databaseId: "<DATABASE_ID>",
     collectionId: "<COLLECTION_ID>",
     key: "",
-    onDelete: .cascade // optional
+    onDelete: .cascade, // optional
+    newKey: "" // optional
 )
 
diff --git a/docs/examples/databases/update-string-attribute.md b/docs/examples/databases/update-string-attribute.md
index a7fb46f..5fafd5e 100644
--- a/docs/examples/databases/update-string-attribute.md
+++ b/docs/examples/databases/update-string-attribute.md
@@ -12,6 +12,8 @@ let attributeString = try await databases.updateStringAttribute(
     collectionId: "<COLLECTION_ID>",
     key: "",
     required: false,
-    default: "<DEFAULT>"
+    default: "<DEFAULT>",
+    size: 0, // optional
+    newKey: "" // optional
 )
 
diff --git a/docs/examples/databases/update-url-attribute.md b/docs/examples/databases/update-url-attribute.md
index d008c93..b442a6a 100644
--- a/docs/examples/databases/update-url-attribute.md
+++ b/docs/examples/databases/update-url-attribute.md
@@ -12,6 +12,7 @@ let attributeUrl = try await databases.updateUrlAttribute(
     collectionId: "<COLLECTION_ID>",
     key: "",
     required: false,
-    default: "https://example.com"
+    default: "https://example.com",
+    newKey: "" // optional
 )