diff --git a/src/Driver/Cassandra/Cassandra.php b/src/Driver/Cassandra/Cassandra.php
index d6dabc5..d2683dc 100644
--- a/src/Driver/Cassandra/Cassandra.php
+++ b/src/Driver/Cassandra/Cassandra.php
@@ -26,7 +26,7 @@
  */
 class Cassandra extends Driver implements CRUDAbleInterface, QueryableInterface
 {
-    public const ID = "cassandra";
+    public const string ID = "cassandra";
     protected string $id = self::ID;
 
     /**
diff --git a/src/Driver/Mysqli/Mysqli.php b/src/Driver/Mysqli/Mysqli.php
index 88f64b6..985f7fb 100644
--- a/src/Driver/Mysqli/Mysqli.php
+++ b/src/Driver/Mysqli/Mysqli.php
@@ -25,7 +25,7 @@
  */
 class Mysqli extends Driver implements CRUDAbleInterface, CRUDQueryableInterface
 {
-    public const ID = "mysqli";
+    public const string ID = "mysqli";
     protected string $id = self::ID;
 
     /**
diff --git a/src/Driver/OpenSearch/OpenSearch.php b/src/Driver/OpenSearch/OpenSearch.php
index 30bebef..a29c387 100644
--- a/src/Driver/OpenSearch/OpenSearch.php
+++ b/src/Driver/OpenSearch/OpenSearch.php
@@ -30,7 +30,7 @@
  */
 class OpenSearch extends Driver implements CRUDAbleInterface, SearchableInterface
 {
-    public const ID = "opensearch";
+    public const string ID = "opensearch";
     protected string $id = self::ID;
 
     /**
diff --git a/src/Driver/Redis/Redis.php b/src/Driver/Redis/Redis.php
index 97748ac..1a71173 100644
--- a/src/Driver/Redis/Redis.php
+++ b/src/Driver/Redis/Redis.php
@@ -20,7 +20,7 @@
  */
 class Redis extends Driver implements CRUDAbleInterface, CacheableInterface
 {
-    public const ID = "redis";
+    public const string ID = "redis";
     protected string $id = self::ID;
 
     /**
diff --git a/src/Driver/Test/TestDriver.php b/src/Driver/Test/TestDriver.php
index 01a1b13..ba47146 100644
--- a/src/Driver/Test/TestDriver.php
+++ b/src/Driver/Test/TestDriver.php
@@ -12,7 +12,7 @@
 
 class TestDriver extends Driver implements CRUDAbleInterface, CRUDQueryableInterface
 {
-    public const ID = "test";
+    public const string ID = "test";
     protected string $id = self::ID;
 
     /**
diff --git a/src/Query/CountField.php b/src/Query/CountField.php
index f54e1e6..30398c3 100644
--- a/src/Query/CountField.php
+++ b/src/Query/CountField.php
@@ -9,7 +9,7 @@
  */
 class CountField extends SelectField
 {
-    public const COUNT_FIELD = "count";
+    public const string COUNT_FIELD = "count";
 
     public ?int $function = self::COUNT;
     public ?string $alias = self::COUNT_FIELD;
@@ -18,4 +18,4 @@ public function __construct()
     {
         parent::__construct("*");
     }
-}
\ No newline at end of file
+}
diff --git a/src/Query/OrderField.php b/src/Query/OrderField.php
index b74ca52..b49eb6d 100644
--- a/src/Query/OrderField.php
+++ b/src/Query/OrderField.php
@@ -12,8 +12,8 @@ class OrderField
     /**
      * Direction constants
      */
-    const ASCENDING = 0;
-    const DESCENDING = 1;
+    const int ASCENDING = 0;
+    const int DESCENDING = 1;
 
     /**
      * Field name to order by
@@ -75,4 +75,4 @@ public function setField(string $field): OrderField
         $this->field = $field;
         return $this;
     }
-}
\ No newline at end of file
+}
diff --git a/src/Query/WhereGroup.php b/src/Query/WhereGroup.php
index 0ea6d60..7db576d 100644
--- a/src/Query/WhereGroup.php
+++ b/src/Query/WhereGroup.php
@@ -15,8 +15,8 @@ class WhereGroup implements Iterator, Countable
     /**
      * Conjunction values
      */
-    const AND = 0;
-    const OR = 1;
+    const int AND = 0;
+    const int OR = 1;
 
     /**
      * Multiple WhereGroup or WhereCondition objects
@@ -128,4 +128,4 @@ public function count(): int
     {
         return count($this->group);
     }
-}
\ No newline at end of file
+}