diff --git a/README.md b/README.md
index 36f787b4..40a3279f 100644
--- a/README.md
+++ b/README.md
@@ -23,7 +23,7 @@ Add this to your package's `pubspec.yaml` file:
 
 ```yml
 dependencies:
-  dart_appwrite: ^18.1.0
+  dart_appwrite: ^19.0.0
 ```
 
 You can install packages from the command line:
diff --git a/lib/enums.dart b/lib/enums.dart
index dd69b671..80ef0308 100644
--- a/lib/enums.dart
+++ b/lib/enums.dart
@@ -25,3 +25,13 @@ part 'src/enums/image_gravity.dart';
 part 'src/enums/image_format.dart';
 part 'src/enums/password_hash.dart';
 part 'src/enums/messaging_provider_type.dart';
+part 'src/enums/database_type.dart';
+part 'src/enums/attribute_status.dart';
+part 'src/enums/column_status.dart';
+part 'src/enums/index_status.dart';
+part 'src/enums/deployment_status.dart';
+part 'src/enums/execution_trigger.dart';
+part 'src/enums/execution_status.dart';
+part 'src/enums/health_antivirus_status.dart';
+part 'src/enums/health_check_status.dart';
+part 'src/enums/message_status.dart';
diff --git a/lib/models.dart b/lib/models.dart
index 1074ae80..513ae2f7 100644
--- a/lib/models.dart
+++ b/lib/models.dart
@@ -1,6 +1,8 @@
 /// Appwrite Models
 library dart_appwrite.models;
 
+import 'enums.dart' as enums;
+
 part 'src/models/model.dart';
 part 'src/models/row_list.dart';
 part 'src/models/document_list.dart';
diff --git a/lib/src/client_browser.dart b/lib/src/client_browser.dart
index 2a92ede3..1eab0a58 100644
--- a/lib/src/client_browser.dart
+++ b/lib/src/client_browser.dart
@@ -30,7 +30,7 @@ class ClientBrowser extends ClientBase with ClientMixin {
       'x-sdk-name': 'Dart',
       'x-sdk-platform': 'server',
       'x-sdk-language': 'dart',
-      'x-sdk-version': '18.1.0',
+      'x-sdk-version': '19.0.0',
       'X-Appwrite-Response-Format': '1.8.0',
     };
 
diff --git a/lib/src/client_io.dart b/lib/src/client_io.dart
index f4b867c4..b534d2a7 100644
--- a/lib/src/client_io.dart
+++ b/lib/src/client_io.dart
@@ -36,9 +36,9 @@ class ClientIO extends ClientBase with ClientMixin {
       'x-sdk-name': 'Dart',
       'x-sdk-platform': 'server',
       'x-sdk-language': 'dart',
-      'x-sdk-version': '18.1.0',
+      'x-sdk-version': '19.0.0',
       'user-agent':
-          'AppwriteDartSDK/18.1.0 (${Platform.operatingSystem}; ${Platform.operatingSystemVersion})',
+          'AppwriteDartSDK/19.0.0 (${Platform.operatingSystem}; ${Platform.operatingSystemVersion})',
       'X-Appwrite-Response-Format': '1.8.0',
     };
 
diff --git a/lib/src/enums/attribute_status.dart b/lib/src/enums/attribute_status.dart
new file mode 100644
index 00000000..baee982b
--- /dev/null
+++ b/lib/src/enums/attribute_status.dart
@@ -0,0 +1,15 @@
+part of '../../enums.dart';
+
+enum AttributeStatus {
+  available(value: 'available'),
+  processing(value: 'processing'),
+  deleting(value: 'deleting'),
+  stuck(value: 'stuck'),
+  failed(value: 'failed');
+
+  const AttributeStatus({required this.value});
+
+  final String value;
+
+  String toJson() => value;
+}
diff --git a/lib/src/enums/column_status.dart b/lib/src/enums/column_status.dart
new file mode 100644
index 00000000..2800e7f8
--- /dev/null
+++ b/lib/src/enums/column_status.dart
@@ -0,0 +1,15 @@
+part of '../../enums.dart';
+
+enum ColumnStatus {
+  available(value: 'available'),
+  processing(value: 'processing'),
+  deleting(value: 'deleting'),
+  stuck(value: 'stuck'),
+  failed(value: 'failed');
+
+  const ColumnStatus({required this.value});
+
+  final String value;
+
+  String toJson() => value;
+}
diff --git a/lib/src/enums/database_type.dart b/lib/src/enums/database_type.dart
new file mode 100644
index 00000000..ce969d69
--- /dev/null
+++ b/lib/src/enums/database_type.dart
@@ -0,0 +1,12 @@
+part of '../../enums.dart';
+
+enum DatabaseType {
+  legacy(value: 'legacy'),
+  tablesdb(value: 'tablesdb');
+
+  const DatabaseType({required this.value});
+
+  final String value;
+
+  String toJson() => value;
+}
diff --git a/lib/src/enums/deployment_status.dart b/lib/src/enums/deployment_status.dart
new file mode 100644
index 00000000..038566b3
--- /dev/null
+++ b/lib/src/enums/deployment_status.dart
@@ -0,0 +1,15 @@
+part of '../../enums.dart';
+
+enum DeploymentStatus {
+  waiting(value: 'waiting'),
+  processing(value: 'processing'),
+  building(value: 'building'),
+  ready(value: 'ready'),
+  failed(value: 'failed');
+
+  const DeploymentStatus({required this.value});
+
+  final String value;
+
+  String toJson() => value;
+}
diff --git a/lib/src/enums/execution_status.dart b/lib/src/enums/execution_status.dart
new file mode 100644
index 00000000..7e793cce
--- /dev/null
+++ b/lib/src/enums/execution_status.dart
@@ -0,0 +1,14 @@
+part of '../../enums.dart';
+
+enum ExecutionStatus {
+  waiting(value: 'waiting'),
+  processing(value: 'processing'),
+  completed(value: 'completed'),
+  failed(value: 'failed');
+
+  const ExecutionStatus({required this.value});
+
+  final String value;
+
+  String toJson() => value;
+}
diff --git a/lib/src/enums/execution_trigger.dart b/lib/src/enums/execution_trigger.dart
new file mode 100644
index 00000000..fb05eb7d
--- /dev/null
+++ b/lib/src/enums/execution_trigger.dart
@@ -0,0 +1,13 @@
+part of '../../enums.dart';
+
+enum ExecutionTrigger {
+  http(value: 'http'),
+  schedule(value: 'schedule'),
+  event(value: 'event');
+
+  const ExecutionTrigger({required this.value});
+
+  final String value;
+
+  String toJson() => value;
+}
diff --git a/lib/src/enums/health_antivirus_status.dart b/lib/src/enums/health_antivirus_status.dart
new file mode 100644
index 00000000..939e0f7d
--- /dev/null
+++ b/lib/src/enums/health_antivirus_status.dart
@@ -0,0 +1,13 @@
+part of '../../enums.dart';
+
+enum HealthAntivirusStatus {
+  disabled(value: 'disabled'),
+  offline(value: 'offline'),
+  online(value: 'online');
+
+  const HealthAntivirusStatus({required this.value});
+
+  final String value;
+
+  String toJson() => value;
+}
diff --git a/lib/src/enums/health_check_status.dart b/lib/src/enums/health_check_status.dart
new file mode 100644
index 00000000..f21e793a
--- /dev/null
+++ b/lib/src/enums/health_check_status.dart
@@ -0,0 +1,12 @@
+part of '../../enums.dart';
+
+enum HealthCheckStatus {
+  pass(value: 'pass'),
+  fail(value: 'fail');
+
+  const HealthCheckStatus({required this.value});
+
+  final String value;
+
+  String toJson() => value;
+}
diff --git a/lib/src/enums/index_status.dart b/lib/src/enums/index_status.dart
new file mode 100644
index 00000000..ccd6473a
--- /dev/null
+++ b/lib/src/enums/index_status.dart
@@ -0,0 +1,15 @@
+part of '../../enums.dart';
+
+enum IndexStatus {
+  available(value: 'available'),
+  processing(value: 'processing'),
+  deleting(value: 'deleting'),
+  stuck(value: 'stuck'),
+  failed(value: 'failed');
+
+  const IndexStatus({required this.value});
+
+  final String value;
+
+  String toJson() => value;
+}
diff --git a/lib/src/enums/message_status.dart b/lib/src/enums/message_status.dart
new file mode 100644
index 00000000..e5ed35ce
--- /dev/null
+++ b/lib/src/enums/message_status.dart
@@ -0,0 +1,15 @@
+part of '../../enums.dart';
+
+enum MessageStatus {
+  draft(value: 'draft'),
+  processing(value: 'processing'),
+  scheduled(value: 'scheduled'),
+  sent(value: 'sent'),
+  failed(value: 'failed');
+
+  const MessageStatus({required this.value});
+
+  final String value;
+
+  String toJson() => value;
+}
diff --git a/lib/src/models/attribute_boolean.dart b/lib/src/models/attribute_boolean.dart
index 0ca54691..3f0eb8fa 100644
--- a/lib/src/models/attribute_boolean.dart
+++ b/lib/src/models/attribute_boolean.dart
@@ -9,7 +9,7 @@ class AttributeBoolean implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -45,7 +45,9 @@ class AttributeBoolean implements Model {
     return AttributeBoolean(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -59,7 +61,7 @@ class AttributeBoolean implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_datetime.dart b/lib/src/models/attribute_datetime.dart
index 1df01f19..4b997e4b 100644
--- a/lib/src/models/attribute_datetime.dart
+++ b/lib/src/models/attribute_datetime.dart
@@ -9,7 +9,7 @@ class AttributeDatetime implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -49,7 +49,9 @@ class AttributeDatetime implements Model {
     return AttributeDatetime(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -64,7 +66,7 @@ class AttributeDatetime implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_email.dart b/lib/src/models/attribute_email.dart
index 21f8e9a3..8a6453a4 100644
--- a/lib/src/models/attribute_email.dart
+++ b/lib/src/models/attribute_email.dart
@@ -9,7 +9,7 @@ class AttributeEmail implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -49,7 +49,9 @@ class AttributeEmail implements Model {
     return AttributeEmail(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -64,7 +66,7 @@ class AttributeEmail implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_enum.dart b/lib/src/models/attribute_enum.dart
index 298c181a..88b662ae 100644
--- a/lib/src/models/attribute_enum.dart
+++ b/lib/src/models/attribute_enum.dart
@@ -9,7 +9,7 @@ class AttributeEnum implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -53,7 +53,9 @@ class AttributeEnum implements Model {
     return AttributeEnum(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -69,7 +71,7 @@ class AttributeEnum implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_float.dart b/lib/src/models/attribute_float.dart
index c6eecadd..bff03dc2 100644
--- a/lib/src/models/attribute_float.dart
+++ b/lib/src/models/attribute_float.dart
@@ -9,7 +9,7 @@ class AttributeFloat implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -53,7 +53,9 @@ class AttributeFloat implements Model {
     return AttributeFloat(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -69,7 +71,7 @@ class AttributeFloat implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_integer.dart b/lib/src/models/attribute_integer.dart
index 1ef48332..ed34cc36 100644
--- a/lib/src/models/attribute_integer.dart
+++ b/lib/src/models/attribute_integer.dart
@@ -9,7 +9,7 @@ class AttributeInteger implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -53,7 +53,9 @@ class AttributeInteger implements Model {
     return AttributeInteger(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -69,7 +71,7 @@ class AttributeInteger implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_ip.dart b/lib/src/models/attribute_ip.dart
index 8c8fcb73..ca38d0c2 100644
--- a/lib/src/models/attribute_ip.dart
+++ b/lib/src/models/attribute_ip.dart
@@ -9,7 +9,7 @@ class AttributeIp implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -49,7 +49,9 @@ class AttributeIp implements Model {
     return AttributeIp(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -64,7 +66,7 @@ class AttributeIp implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_line.dart b/lib/src/models/attribute_line.dart
index cae9d1c4..57e11ec1 100644
--- a/lib/src/models/attribute_line.dart
+++ b/lib/src/models/attribute_line.dart
@@ -9,7 +9,7 @@ class AttributeLine implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -45,7 +45,9 @@ class AttributeLine implements Model {
     return AttributeLine(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -59,7 +61,7 @@ class AttributeLine implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_point.dart b/lib/src/models/attribute_point.dart
index e0dccf41..26af9d6f 100644
--- a/lib/src/models/attribute_point.dart
+++ b/lib/src/models/attribute_point.dart
@@ -9,7 +9,7 @@ class AttributePoint implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -45,7 +45,9 @@ class AttributePoint implements Model {
     return AttributePoint(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -59,7 +61,7 @@ class AttributePoint implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_polygon.dart b/lib/src/models/attribute_polygon.dart
index bd1ea95f..6da30bc7 100644
--- a/lib/src/models/attribute_polygon.dart
+++ b/lib/src/models/attribute_polygon.dart
@@ -9,7 +9,7 @@ class AttributePolygon implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -45,7 +45,9 @@ class AttributePolygon implements Model {
     return AttributePolygon(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -59,7 +61,7 @@ class AttributePolygon implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_relationship.dart b/lib/src/models/attribute_relationship.dart
index 903c6290..af87a8c2 100644
--- a/lib/src/models/attribute_relationship.dart
+++ b/lib/src/models/attribute_relationship.dart
@@ -9,7 +9,7 @@ class AttributeRelationship implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -65,7 +65,9 @@ class AttributeRelationship implements Model {
     return AttributeRelationship(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -84,7 +86,7 @@ class AttributeRelationship implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_string.dart b/lib/src/models/attribute_string.dart
index 7374fa78..93adf838 100644
--- a/lib/src/models/attribute_string.dart
+++ b/lib/src/models/attribute_string.dart
@@ -9,7 +9,7 @@ class AttributeString implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -53,7 +53,9 @@ class AttributeString implements Model {
     return AttributeString(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -69,7 +71,7 @@ class AttributeString implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/attribute_url.dart b/lib/src/models/attribute_url.dart
index f0bc295e..cad8fb03 100644
--- a/lib/src/models/attribute_url.dart
+++ b/lib/src/models/attribute_url.dart
@@ -9,7 +9,7 @@ class AttributeUrl implements Model {
   final String type;
 
   /// Attribute status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.AttributeStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an attribute.
   final String error;
@@ -49,7 +49,9 @@ class AttributeUrl implements Model {
     return AttributeUrl(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.AttributeStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -64,7 +66,7 @@ class AttributeUrl implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_boolean.dart b/lib/src/models/column_boolean.dart
index 9d5013c0..8f14f709 100644
--- a/lib/src/models/column_boolean.dart
+++ b/lib/src/models/column_boolean.dart
@@ -9,7 +9,7 @@ class ColumnBoolean implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -45,7 +45,9 @@ class ColumnBoolean implements Model {
     return ColumnBoolean(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -59,7 +61,7 @@ class ColumnBoolean implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_datetime.dart b/lib/src/models/column_datetime.dart
index 2341fc3b..2691c131 100644
--- a/lib/src/models/column_datetime.dart
+++ b/lib/src/models/column_datetime.dart
@@ -9,7 +9,7 @@ class ColumnDatetime implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -49,7 +49,9 @@ class ColumnDatetime implements Model {
     return ColumnDatetime(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -64,7 +66,7 @@ class ColumnDatetime implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_email.dart b/lib/src/models/column_email.dart
index a822c4e5..aeed028d 100644
--- a/lib/src/models/column_email.dart
+++ b/lib/src/models/column_email.dart
@@ -9,7 +9,7 @@ class ColumnEmail implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -49,7 +49,9 @@ class ColumnEmail implements Model {
     return ColumnEmail(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -64,7 +66,7 @@ class ColumnEmail implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_enum.dart b/lib/src/models/column_enum.dart
index 115108a4..b0558ede 100644
--- a/lib/src/models/column_enum.dart
+++ b/lib/src/models/column_enum.dart
@@ -9,7 +9,7 @@ class ColumnEnum implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -53,7 +53,9 @@ class ColumnEnum implements Model {
     return ColumnEnum(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -69,7 +71,7 @@ class ColumnEnum implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_float.dart b/lib/src/models/column_float.dart
index a3a4e3b7..e228b007 100644
--- a/lib/src/models/column_float.dart
+++ b/lib/src/models/column_float.dart
@@ -9,7 +9,7 @@ class ColumnFloat implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -53,7 +53,9 @@ class ColumnFloat implements Model {
     return ColumnFloat(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -69,7 +71,7 @@ class ColumnFloat implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_integer.dart b/lib/src/models/column_integer.dart
index 82bf6734..4a63e77b 100644
--- a/lib/src/models/column_integer.dart
+++ b/lib/src/models/column_integer.dart
@@ -9,7 +9,7 @@ class ColumnInteger implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -53,7 +53,9 @@ class ColumnInteger implements Model {
     return ColumnInteger(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -69,7 +71,7 @@ class ColumnInteger implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_ip.dart b/lib/src/models/column_ip.dart
index 13bb322c..aa81824e 100644
--- a/lib/src/models/column_ip.dart
+++ b/lib/src/models/column_ip.dart
@@ -9,7 +9,7 @@ class ColumnIp implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -49,7 +49,9 @@ class ColumnIp implements Model {
     return ColumnIp(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -64,7 +66,7 @@ class ColumnIp implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_line.dart b/lib/src/models/column_line.dart
index 937932a1..fda8a070 100644
--- a/lib/src/models/column_line.dart
+++ b/lib/src/models/column_line.dart
@@ -9,7 +9,7 @@ class ColumnLine implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -45,7 +45,9 @@ class ColumnLine implements Model {
     return ColumnLine(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -59,7 +61,7 @@ class ColumnLine implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_point.dart b/lib/src/models/column_point.dart
index 9c9034e5..a773fa34 100644
--- a/lib/src/models/column_point.dart
+++ b/lib/src/models/column_point.dart
@@ -9,7 +9,7 @@ class ColumnPoint implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -45,7 +45,9 @@ class ColumnPoint implements Model {
     return ColumnPoint(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -59,7 +61,7 @@ class ColumnPoint implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_polygon.dart b/lib/src/models/column_polygon.dart
index dedd5e64..f733a1ea 100644
--- a/lib/src/models/column_polygon.dart
+++ b/lib/src/models/column_polygon.dart
@@ -9,7 +9,7 @@ class ColumnPolygon implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -45,7 +45,9 @@ class ColumnPolygon implements Model {
     return ColumnPolygon(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -59,7 +61,7 @@ class ColumnPolygon implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_relationship.dart b/lib/src/models/column_relationship.dart
index 6221c01e..be709c7f 100644
--- a/lib/src/models/column_relationship.dart
+++ b/lib/src/models/column_relationship.dart
@@ -9,7 +9,7 @@ class ColumnRelationship implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -65,7 +65,9 @@ class ColumnRelationship implements Model {
     return ColumnRelationship(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -84,7 +86,7 @@ class ColumnRelationship implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_string.dart b/lib/src/models/column_string.dart
index 7b560989..0d4f3031 100644
--- a/lib/src/models/column_string.dart
+++ b/lib/src/models/column_string.dart
@@ -9,7 +9,7 @@ class ColumnString implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -53,7 +53,9 @@ class ColumnString implements Model {
     return ColumnString(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -69,7 +71,7 @@ class ColumnString implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/column_url.dart b/lib/src/models/column_url.dart
index 66c0ce7b..5f09e863 100644
--- a/lib/src/models/column_url.dart
+++ b/lib/src/models/column_url.dart
@@ -9,7 +9,7 @@ class ColumnUrl implements Model {
   final String type;
 
   /// Column status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.ColumnStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an column.
   final String error;
@@ -49,7 +49,9 @@ class ColumnUrl implements Model {
     return ColumnUrl(
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.ColumnStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       xrequired: map['required'],
       array: map['array'],
@@ -64,7 +66,7 @@ class ColumnUrl implements Model {
     return {
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "required": xrequired,
       "array": array,
diff --git a/lib/src/models/database.dart b/lib/src/models/database.dart
index 8d79e052..f615b840 100644
--- a/lib/src/models/database.dart
+++ b/lib/src/models/database.dart
@@ -18,7 +18,7 @@ class Database implements Model {
   final bool enabled;
 
   /// Database type.
-  final String type;
+  final enums.DatabaseType type;
 
   Database({
     required this.$id,
@@ -36,7 +36,7 @@ class Database implements Model {
       $createdAt: map['\$createdAt'].toString(),
       $updatedAt: map['\$updatedAt'].toString(),
       enabled: map['enabled'],
-      type: map['type'].toString(),
+      type: enums.DatabaseType.values.firstWhere((e) => e.value == map['type']),
     );
   }
 
@@ -47,7 +47,7 @@ class Database implements Model {
       "\$createdAt": $createdAt,
       "\$updatedAt": $updatedAt,
       "enabled": enabled,
-      "type": type,
+      "type": type.value,
     };
   }
 }
diff --git a/lib/src/models/deployment.dart b/lib/src/models/deployment.dart
index 976976ea..d679c0db 100644
--- a/lib/src/models/deployment.dart
+++ b/lib/src/models/deployment.dart
@@ -45,7 +45,7 @@ class Deployment implements Model {
   final String screenshotDark;
 
   /// The deployment status. Possible values are "waiting", "processing", "building", "ready", and "failed".
-  final String status;
+  final enums.DeploymentStatus status;
 
   /// The build logs.
   final String buildLogs;
@@ -129,7 +129,9 @@ class Deployment implements Model {
       activate: map['activate'],
       screenshotLight: map['screenshotLight'].toString(),
       screenshotDark: map['screenshotDark'].toString(),
-      status: map['status'].toString(),
+      status: enums.DeploymentStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       buildLogs: map['buildLogs'].toString(),
       buildDuration: map['buildDuration'],
       providerRepositoryName: map['providerRepositoryName'].toString(),
@@ -161,7 +163,7 @@ class Deployment implements Model {
       "activate": activate,
       "screenshotLight": screenshotLight,
       "screenshotDark": screenshotDark,
-      "status": status,
+      "status": status.value,
       "buildLogs": buildLogs,
       "buildDuration": buildDuration,
       "providerRepositoryName": providerRepositoryName,
diff --git a/lib/src/models/document.dart b/lib/src/models/document.dart
index cf85e457..06733467 100644
--- a/lib/src/models/document.dart
+++ b/lib/src/models/document.dart
@@ -45,7 +45,7 @@ class Document implements Model {
       $createdAt: map['\$createdAt'].toString(),
       $updatedAt: map['\$updatedAt'].toString(),
       $permissions: List.from(map['\$permissions'] ?? []),
-      data: map,
+      data: map["data"] ?? map,
     );
   }
 
diff --git a/lib/src/models/execution.dart b/lib/src/models/execution.dart
index 0da5c52f..4b4830eb 100644
--- a/lib/src/models/execution.dart
+++ b/lib/src/models/execution.dart
@@ -21,10 +21,10 @@ class Execution implements Model {
   final String deploymentId;
 
   /// The trigger that caused the function to execute. Possible values can be: `http`, `schedule`, or `event`.
-  final String trigger;
+  final enums.ExecutionTrigger trigger;
 
   /// The status of the function execution. Possible values can be: `waiting`, `processing`, `completed`, or `failed`.
-  final String status;
+  final enums.ExecutionStatus status;
 
   /// HTTP request method type.
   final String requestMethod;
@@ -85,8 +85,12 @@ class Execution implements Model {
       $permissions: List.from(map['\$permissions'] ?? []),
       functionId: map['functionId'].toString(),
       deploymentId: map['deploymentId'].toString(),
-      trigger: map['trigger'].toString(),
-      status: map['status'].toString(),
+      trigger: enums.ExecutionTrigger.values.firstWhere(
+        (e) => e.value == map['trigger'],
+      ),
+      status: enums.ExecutionStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       requestMethod: map['requestMethod'].toString(),
       requestPath: map['requestPath'].toString(),
       requestHeaders: List<Headers>.from(
@@ -112,8 +116,8 @@ class Execution implements Model {
       "\$permissions": $permissions,
       "functionId": functionId,
       "deploymentId": deploymentId,
-      "trigger": trigger,
-      "status": status,
+      "trigger": trigger.value,
+      "status": status.value,
       "requestMethod": requestMethod,
       "requestPath": requestPath,
       "requestHeaders": requestHeaders.map((p) => p.toMap()).toList(),
diff --git a/lib/src/models/health_antivirus.dart b/lib/src/models/health_antivirus.dart
index 60db4b88..8b8e7ed5 100644
--- a/lib/src/models/health_antivirus.dart
+++ b/lib/src/models/health_antivirus.dart
@@ -6,18 +6,20 @@ class HealthAntivirus implements Model {
   final String version;
 
   /// Antivirus status. Possible values are: `disabled`, `offline`, `online`
-  final String status;
+  final enums.HealthAntivirusStatus status;
 
   HealthAntivirus({required this.version, required this.status});
 
   factory HealthAntivirus.fromMap(Map<String, dynamic> map) {
     return HealthAntivirus(
       version: map['version'].toString(),
-      status: map['status'].toString(),
+      status: enums.HealthAntivirusStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
     );
   }
 
   Map<String, dynamic> toMap() {
-    return {"version": version, "status": status};
+    return {"version": version, "status": status.value};
   }
 }
diff --git a/lib/src/models/health_status.dart b/lib/src/models/health_status.dart
index fe60eed5..5192b20e 100644
--- a/lib/src/models/health_status.dart
+++ b/lib/src/models/health_status.dart
@@ -9,7 +9,7 @@ class HealthStatus implements Model {
   final int ping;
 
   /// Service status. Possible values are: `pass`, `fail`
-  final String status;
+  final enums.HealthCheckStatus status;
 
   HealthStatus({required this.name, required this.ping, required this.status});
 
@@ -17,11 +17,13 @@ class HealthStatus implements Model {
     return HealthStatus(
       name: map['name'].toString(),
       ping: map['ping'],
-      status: map['status'].toString(),
+      status: enums.HealthCheckStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
     );
   }
 
   Map<String, dynamic> toMap() {
-    return {"name": name, "ping": ping, "status": status};
+    return {"name": name, "ping": ping, "status": status.value};
   }
 }
diff --git a/lib/src/models/index.dart b/lib/src/models/index.dart
index 9d6d7aec..100e4f93 100644
--- a/lib/src/models/index.dart
+++ b/lib/src/models/index.dart
@@ -18,7 +18,7 @@ class Index implements Model {
   final String type;
 
   /// Index status. Possible values: `available`, `processing`, `deleting`, `stuck`, or `failed`
-  final String status;
+  final enums.IndexStatus status;
 
   /// Error message. Displays error generated on failure of creating or deleting an index.
   final String error;
@@ -52,7 +52,9 @@ class Index implements Model {
       $updatedAt: map['\$updatedAt'].toString(),
       key: map['key'].toString(),
       type: map['type'].toString(),
-      status: map['status'].toString(),
+      status: enums.IndexStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
       error: map['error'].toString(),
       attributes: List.from(map['attributes'] ?? []),
       lengths: List.from(map['lengths'] ?? []),
@@ -67,7 +69,7 @@ class Index implements Model {
       "\$updatedAt": $updatedAt,
       "key": key,
       "type": type,
-      "status": status,
+      "status": status.value,
       "error": error,
       "attributes": attributes,
       "lengths": lengths,
diff --git a/lib/src/models/message.dart b/lib/src/models/message.dart
index 9b93b00d..4c96782d 100644
--- a/lib/src/models/message.dart
+++ b/lib/src/models/message.dart
@@ -39,7 +39,7 @@ class Message implements Model {
   final Map<String, dynamic> data;
 
   /// Status of delivery.
-  final String status;
+  final enums.MessageStatus status;
 
   Message({
     required this.$id,
@@ -71,7 +71,9 @@ class Message implements Model {
       deliveryErrors: List.from(map['deliveryErrors'] ?? []),
       deliveredTotal: map['deliveredTotal'],
       data: map['data'],
-      status: map['status'].toString(),
+      status: enums.MessageStatus.values.firstWhere(
+        (e) => e.value == map['status'],
+      ),
     );
   }
 
@@ -89,7 +91,7 @@ class Message implements Model {
       "deliveryErrors": deliveryErrors,
       "deliveredTotal": deliveredTotal,
       "data": data,
-      "status": status,
+      "status": status.value,
     };
   }
 }
diff --git a/lib/src/models/preferences.dart b/lib/src/models/preferences.dart
index 7bc3abc9..777f5925 100644
--- a/lib/src/models/preferences.dart
+++ b/lib/src/models/preferences.dart
@@ -7,7 +7,7 @@ class Preferences implements Model {
   Preferences({required this.data});
 
   factory Preferences.fromMap(Map<String, dynamic> map) {
-    return Preferences(data: map);
+    return Preferences(data: map["data"] ?? map);
   }
 
   Map<String, dynamic> toMap() {
diff --git a/lib/src/models/row.dart b/lib/src/models/row.dart
index 3700e577..6dfddd27 100644
--- a/lib/src/models/row.dart
+++ b/lib/src/models/row.dart
@@ -45,7 +45,7 @@ class Row implements Model {
       $createdAt: map['\$createdAt'].toString(),
       $updatedAt: map['\$updatedAt'].toString(),
       $permissions: List.from(map['\$permissions'] ?? []),
-      data: map,
+      data: map["data"] ?? map,
     );
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index 577eb12a..0a9e397e 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,5 +1,5 @@
 name: dart_appwrite
-version: 18.1.0
+version: 19.0.0
 description: Appwrite is an open-source self-hosted backend server that abstract and simplify complex and repetitive development tasks behind a very simple REST API
 homepage: https://appwrite.io
 repository: https://github.com/appwrite/sdk-for-dart
diff --git a/test/src/models/attribute_boolean_test.dart b/test/src/models/attribute_boolean_test.dart
index 39319182..4e1ebb05 100644
--- a/test/src/models/attribute_boolean_test.dart
+++ b/test/src/models/attribute_boolean_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeBoolean(
         key: 'isEnabled',
         type: 'boolean',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'isEnabled');
                   expect(result.type, 'boolean');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_datetime_test.dart b/test/src/models/attribute_datetime_test.dart
index 42ae6cc6..5ae8fa00 100644
--- a/test/src/models/attribute_datetime_test.dart
+++ b/test/src/models/attribute_datetime_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeDatetime(
         key: 'birthDay',
         type: 'datetime',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -20,7 +21,7 @@ void main() {
 
             expect(result.key, 'birthDay');
                   expect(result.type, 'datetime');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_email_test.dart b/test/src/models/attribute_email_test.dart
index 8bff3e81..5d8ecea7 100644
--- a/test/src/models/attribute_email_test.dart
+++ b/test/src/models/attribute_email_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeEmail(
         key: 'userEmail',
         type: 'string',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -20,7 +21,7 @@ void main() {
 
             expect(result.key, 'userEmail');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_enum_test.dart b/test/src/models/attribute_enum_test.dart
index cf741a60..5bffd427 100644
--- a/test/src/models/attribute_enum_test.dart
+++ b/test/src/models/attribute_enum_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeEnum(
         key: 'status',
         type: 'string',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -21,7 +22,7 @@ void main() {
 
             expect(result.key, 'status');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_float_test.dart b/test/src/models/attribute_float_test.dart
index 1dbf3078..ade52316 100644
--- a/test/src/models/attribute_float_test.dart
+++ b/test/src/models/attribute_float_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeFloat(
         key: 'percentageCompleted',
         type: 'double',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'percentageCompleted');
                   expect(result.type, 'double');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_integer_test.dart b/test/src/models/attribute_integer_test.dart
index 9baa191f..c5241be4 100644
--- a/test/src/models/attribute_integer_test.dart
+++ b/test/src/models/attribute_integer_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeInteger(
         key: 'count',
         type: 'integer',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'count');
                   expect(result.type, 'integer');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_ip_test.dart b/test/src/models/attribute_ip_test.dart
index f1e7c993..9b808863 100644
--- a/test/src/models/attribute_ip_test.dart
+++ b/test/src/models/attribute_ip_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeIp(
         key: 'ipAddress',
         type: 'string',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -20,7 +21,7 @@ void main() {
 
             expect(result.key, 'ipAddress');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_line_test.dart b/test/src/models/attribute_line_test.dart
index f5739e35..c1924a5d 100644
--- a/test/src/models/attribute_line_test.dart
+++ b/test/src/models/attribute_line_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeLine(
         key: 'fullName',
         type: 'string',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'fullName');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_point_test.dart b/test/src/models/attribute_point_test.dart
index a95214bb..2f90d374 100644
--- a/test/src/models/attribute_point_test.dart
+++ b/test/src/models/attribute_point_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributePoint(
         key: 'fullName',
         type: 'string',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'fullName');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_polygon_test.dart b/test/src/models/attribute_polygon_test.dart
index d8649b93..a4b452d1 100644
--- a/test/src/models/attribute_polygon_test.dart
+++ b/test/src/models/attribute_polygon_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributePolygon(
         key: 'fullName',
         type: 'string',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'fullName');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_relationship_test.dart b/test/src/models/attribute_relationship_test.dart
index 4ee29944..2bccd34c 100644
--- a/test/src/models/attribute_relationship_test.dart
+++ b/test/src/models/attribute_relationship_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeRelationship(
         key: 'fullName',
         type: 'string',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -25,7 +26,7 @@ void main() {
 
             expect(result.key, 'fullName');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_string_test.dart b/test/src/models/attribute_string_test.dart
index f5e93640..8f92eb26 100644
--- a/test/src/models/attribute_string_test.dart
+++ b/test/src/models/attribute_string_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeString(
         key: 'fullName',
         type: 'string',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -20,7 +21,7 @@ void main() {
 
             expect(result.key, 'fullName');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/attribute_url_test.dart b/test/src/models/attribute_url_test.dart
index 4cfdbc40..cc751748 100644
--- a/test/src/models/attribute_url_test.dart
+++ b/test/src/models/attribute_url_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = AttributeUrl(
         key: 'githubUrl',
         type: 'string',
-        status: 'available',
+        status: AttributeStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -20,7 +21,7 @@ void main() {
 
             expect(result.key, 'githubUrl');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, AttributeStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_boolean_test.dart b/test/src/models/column_boolean_test.dart
index 578d1ffc..c0c52eaf 100644
--- a/test/src/models/column_boolean_test.dart
+++ b/test/src/models/column_boolean_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnBoolean(
         key: 'isEnabled',
         type: 'boolean',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'isEnabled');
                   expect(result.type, 'boolean');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_datetime_test.dart b/test/src/models/column_datetime_test.dart
index 9efa877f..5f8995b0 100644
--- a/test/src/models/column_datetime_test.dart
+++ b/test/src/models/column_datetime_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnDatetime(
         key: 'birthDay',
         type: 'datetime',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -20,7 +21,7 @@ void main() {
 
             expect(result.key, 'birthDay');
                   expect(result.type, 'datetime');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_email_test.dart b/test/src/models/column_email_test.dart
index 6af65d64..9047dc81 100644
--- a/test/src/models/column_email_test.dart
+++ b/test/src/models/column_email_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnEmail(
         key: 'userEmail',
         type: 'string',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -20,7 +21,7 @@ void main() {
 
             expect(result.key, 'userEmail');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_enum_test.dart b/test/src/models/column_enum_test.dart
index 8d4f4772..b27fa78a 100644
--- a/test/src/models/column_enum_test.dart
+++ b/test/src/models/column_enum_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnEnum(
         key: 'status',
         type: 'string',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -21,7 +22,7 @@ void main() {
 
             expect(result.key, 'status');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_float_test.dart b/test/src/models/column_float_test.dart
index 316b566b..5d8fc98f 100644
--- a/test/src/models/column_float_test.dart
+++ b/test/src/models/column_float_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnFloat(
         key: 'percentageCompleted',
         type: 'double',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'percentageCompleted');
                   expect(result.type, 'double');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_integer_test.dart b/test/src/models/column_integer_test.dart
index 911588d3..ee484733 100644
--- a/test/src/models/column_integer_test.dart
+++ b/test/src/models/column_integer_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnInteger(
         key: 'count',
         type: 'integer',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'count');
                   expect(result.type, 'integer');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_ip_test.dart b/test/src/models/column_ip_test.dart
index a1153e85..8cde17c9 100644
--- a/test/src/models/column_ip_test.dart
+++ b/test/src/models/column_ip_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnIp(
         key: 'ipAddress',
         type: 'string',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -20,7 +21,7 @@ void main() {
 
             expect(result.key, 'ipAddress');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_line_test.dart b/test/src/models/column_line_test.dart
index 3f5d647f..a4ffbdb4 100644
--- a/test/src/models/column_line_test.dart
+++ b/test/src/models/column_line_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnLine(
         key: 'fullName',
         type: 'string',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'fullName');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_point_test.dart b/test/src/models/column_point_test.dart
index a9ef663b..3467e248 100644
--- a/test/src/models/column_point_test.dart
+++ b/test/src/models/column_point_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnPoint(
         key: 'fullName',
         type: 'string',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'fullName');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_polygon_test.dart b/test/src/models/column_polygon_test.dart
index c2a3a1b3..a34ff03f 100644
--- a/test/src/models/column_polygon_test.dart
+++ b/test/src/models/column_polygon_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnPolygon(
         key: 'fullName',
         type: 'string',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -19,7 +20,7 @@ void main() {
 
             expect(result.key, 'fullName');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_relationship_test.dart b/test/src/models/column_relationship_test.dart
index 3de4bc71..a5b793de 100644
--- a/test/src/models/column_relationship_test.dart
+++ b/test/src/models/column_relationship_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnRelationship(
         key: 'fullName',
         type: 'string',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -25,7 +26,7 @@ void main() {
 
             expect(result.key, 'fullName');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_string_test.dart b/test/src/models/column_string_test.dart
index e6c11716..49816f92 100644
--- a/test/src/models/column_string_test.dart
+++ b/test/src/models/column_string_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnString(
         key: 'fullName',
         type: 'string',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -20,7 +21,7 @@ void main() {
 
             expect(result.key, 'fullName');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/column_url_test.dart b/test/src/models/column_url_test.dart
index ad8cde9f..671b940e 100644
--- a/test/src/models/column_url_test.dart
+++ b/test/src/models/column_url_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = ColumnUrl(
         key: 'githubUrl',
         type: 'string',
-        status: 'available',
+        status: ColumnStatus.available,
         error: 'string',
         xrequired: true,
         $createdAt: '2020-10-15T06:38:00.000+00:00',
@@ -20,7 +21,7 @@ void main() {
 
             expect(result.key, 'githubUrl');
                   expect(result.type, 'string');
-                  expect(result.status, 'available');
+                  expect(result.status, ColumnStatus.available);
                   expect(result.error, 'string');
                   expect(result.xrequired, true);
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
diff --git a/test/src/models/database_test.dart b/test/src/models/database_test.dart
index 191a10fd..a5c3e030 100644
--- a/test/src/models/database_test.dart
+++ b/test/src/models/database_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -10,7 +11,7 @@ void main() {
         $createdAt: '2020-10-15T06:38:00.000+00:00',
         $updatedAt: '2020-10-15T06:38:00.000+00:00',
         enabled: true,
-        type: 'legacy',
+        type: DatabaseType.legacy,
       );
 
       final map = model.toMap();
@@ -21,7 +22,7 @@ void main() {
                   expect(result.$createdAt, '2020-10-15T06:38:00.000+00:00');
                   expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
                   expect(result.enabled, true);
-                  expect(result.type, 'legacy');
+                  expect(result.type, DatabaseType.legacy);
           });
   });
 }
diff --git a/test/src/models/deployment_test.dart b/test/src/models/deployment_test.dart
index 68ce2045..16f003b2 100644
--- a/test/src/models/deployment_test.dart
+++ b/test/src/models/deployment_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -19,7 +20,7 @@ void main() {
         activate: true,
         screenshotLight: '5e5ea5c16897e',
         screenshotDark: '5e5ea5c16897e',
-        status: 'ready',
+        status: DeploymentStatus.waiting,
         buildLogs: 'Compiling source files...',
         buildDuration: 128,
         providerRepositoryName: 'database',
@@ -51,7 +52,7 @@ void main() {
                   expect(result.activate, true);
                   expect(result.screenshotLight, '5e5ea5c16897e');
                   expect(result.screenshotDark, '5e5ea5c16897e');
-                  expect(result.status, 'ready');
+                  expect(result.status, DeploymentStatus.waiting);
                   expect(result.buildLogs, 'Compiling source files...');
                   expect(result.buildDuration, 128);
                   expect(result.providerRepositoryName, 'database');
diff --git a/test/src/models/execution_test.dart b/test/src/models/execution_test.dart
index 01ff6290..0e1b7b9c 100644
--- a/test/src/models/execution_test.dart
+++ b/test/src/models/execution_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -11,8 +12,8 @@ void main() {
         $permissions: [],
         functionId: '5e5ea6g16897e',
         deploymentId: '5e5ea5c16897e',
-        trigger: 'http',
-        status: 'processing',
+        trigger: ExecutionTrigger.http,
+        status: ExecutionStatus.waiting,
         requestMethod: 'GET',
         requestPath: '/articles?id=5',
         requestHeaders: [],
@@ -33,8 +34,8 @@ void main() {
                   expect(result.$permissions, []);
                   expect(result.functionId, '5e5ea6g16897e');
                   expect(result.deploymentId, '5e5ea5c16897e');
-                  expect(result.trigger, 'http');
-                  expect(result.status, 'processing');
+                  expect(result.trigger, ExecutionTrigger.http);
+                  expect(result.status, ExecutionStatus.waiting);
                   expect(result.requestMethod, 'GET');
                   expect(result.requestPath, '/articles?id=5');
                   expect(result.requestHeaders, []);
diff --git a/test/src/models/health_antivirus_test.dart b/test/src/models/health_antivirus_test.dart
index 56e3d755..d09a016b 100644
--- a/test/src/models/health_antivirus_test.dart
+++ b/test/src/models/health_antivirus_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -6,14 +7,14 @@ void main() {
     test('model', () {
       final model = HealthAntivirus(
         version: '1.0.0',
-        status: 'online',
+        status: HealthAntivirusStatus.disabled,
       );
 
       final map = model.toMap();
       final result = HealthAntivirus.fromMap(map);
 
             expect(result.version, '1.0.0');
-                  expect(result.status, 'online');
+                  expect(result.status, HealthAntivirusStatus.disabled);
           });
   });
 }
diff --git a/test/src/models/health_status_test.dart b/test/src/models/health_status_test.dart
index 36be52ad..e98c788f 100644
--- a/test/src/models/health_status_test.dart
+++ b/test/src/models/health_status_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -7,7 +8,7 @@ void main() {
       final model = HealthStatus(
         name: 'database',
         ping: 128,
-        status: 'pass',
+        status: HealthCheckStatus.pass,
       );
 
       final map = model.toMap();
@@ -15,7 +16,7 @@ void main() {
 
             expect(result.name, 'database');
                   expect(result.ping, 128);
-                  expect(result.status, 'pass');
+                  expect(result.status, HealthCheckStatus.pass);
           });
   });
 }
diff --git a/test/src/models/index_test.dart b/test/src/models/index_test.dart
index 54733385..922976a3 100644
--- a/test/src/models/index_test.dart
+++ b/test/src/models/index_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -10,7 +11,7 @@ void main() {
         $updatedAt: '2020-10-15T06:38:00.000+00:00',
         key: 'index1',
         type: 'primary',
-        status: 'available',
+        status: IndexStatus.available,
         error: 'string',
         attributes: [],
         lengths: [],
@@ -24,7 +25,7 @@ void main() {
                   expect(result.$updatedAt, '2020-10-15T06:38:00.000+00:00');
                   expect(result.key, 'index1');
                   expect(result.type, 'primary');
-                  expect(result.status, 'available');
+                  expect(result.status, IndexStatus.available);
                   expect(result.error, 'string');
                   expect(result.attributes, []);
                   expect(result.lengths, []);
diff --git a/test/src/models/message_test.dart b/test/src/models/message_test.dart
index 64b2feac..330e09a0 100644
--- a/test/src/models/message_test.dart
+++ b/test/src/models/message_test.dart
@@ -1,4 +1,5 @@
 import 'package:dart_appwrite/models.dart';
+import 'package:dart_appwrite/enums.dart';
 import 'package:test/test.dart';
 
 void main() {
@@ -14,7 +15,7 @@ void main() {
         targets: [],
         deliveredTotal: 1,
         data: {},
-        status: 'Message status can be one of the following: draft, processing, scheduled, sent, or failed.',
+        status: MessageStatus.draft,
       );
 
       final map = model.toMap();
@@ -29,7 +30,7 @@ void main() {
                   expect(result.targets, []);
                   expect(result.deliveredTotal, 1);
                   expect(result.data, {});
-                  expect(result.status, 'Message status can be one of the following: draft, processing, scheduled, sent, or failed.');
+                  expect(result.status, MessageStatus.draft);
           });
   });
 }