diff --git a/src/Resources/Actions.php b/src/Resources/Actions.php
index 5225449..d6fd88f 100644
--- a/src/Resources/Actions.php
+++ b/src/Resources/Actions.php
@@ -8,9 +8,9 @@
 
 class Actions extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function summary(): object|array
     {
diff --git a/src/Resources/BaseResource.php b/src/Resources/BaseResource.php
index b598370..bb2e62a 100644
--- a/src/Resources/BaseResource.php
+++ b/src/Resources/BaseResource.php
@@ -11,11 +11,11 @@
 
 abstract class BaseResource
 {
-    use Tappable,
-        Cacheable,
+    use Cacheable,
         Macroable,
         SelectsAmount,
-        Sortable;
+        Sortable,
+        Tappable;
 
     public function __construct(
         public MatomoClient $client
diff --git a/src/Resources/Contents.php b/src/Resources/Contents.php
index 00352c6..5d0fa37 100644
--- a/src/Resources/Contents.php
+++ b/src/Resources/Contents.php
@@ -8,9 +8,9 @@
 
 class Contents extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function names(): object|array
     {
diff --git a/src/Resources/DevicesDetection.php b/src/Resources/DevicesDetection.php
index 6e5f46d..9681ee4 100644
--- a/src/Resources/DevicesDetection.php
+++ b/src/Resources/DevicesDetection.php
@@ -8,9 +8,9 @@
 
 class DevicesDetection extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function types(): object|array
     {
diff --git a/src/Resources/Events.php b/src/Resources/Events.php
index 57da0d6..1f731e3 100644
--- a/src/Resources/Events.php
+++ b/src/Resources/Events.php
@@ -9,10 +9,10 @@
 
 class Events extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate,
-        SelectsSecondaryDimension;
+        SelectsSecondaryDimension,
+        SelectsSites;
 
     public function categories(): object|array
     {
diff --git a/src/Resources/Goals.php b/src/Resources/Goals.php
index c833e91..1e4fba5 100644
--- a/src/Resources/Goals.php
+++ b/src/Resources/Goals.php
@@ -8,11 +8,11 @@
 
 class Goals extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
-    public function summary(?int $goalId = null): object|array
+    public function summary(int $goalId = null): object|array
     {
         $query = [];
 
diff --git a/src/Resources/Live.php b/src/Resources/Live.php
index 25746de..230813c 100644
--- a/src/Resources/Live.php
+++ b/src/Resources/Live.php
@@ -8,9 +8,9 @@
 
 class Live extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function counters(int $lastMinutes = 30): object|array
     {
@@ -19,7 +19,7 @@ public function counters(int $lastMinutes = 30): object|array
         ]);
     }
 
-    public function lastVisits(?int $amount = null): object|array
+    public function lastVisits(int $amount = null): object|array
     {
         $query = [];
 
diff --git a/src/Resources/MarketingCampaignsReporting.php b/src/Resources/MarketingCampaignsReporting.php
index 3c89c83..fb3420e 100644
--- a/src/Resources/MarketingCampaignsReporting.php
+++ b/src/Resources/MarketingCampaignsReporting.php
@@ -8,9 +8,9 @@
 
 class MarketingCampaignsReporting extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function id(): object|array
     {
diff --git a/src/Resources/PagePerformance.php b/src/Resources/PagePerformance.php
index 9013c5a..1f66c21 100644
--- a/src/Resources/PagePerformance.php
+++ b/src/Resources/PagePerformance.php
@@ -8,9 +8,9 @@
 
 class PagePerformance extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function summary(): object|array
     {
diff --git a/src/Resources/Referrers.php b/src/Resources/Referrers.php
index 840a072..940d221 100644
--- a/src/Resources/Referrers.php
+++ b/src/Resources/Referrers.php
@@ -8,9 +8,9 @@
 
 class Referrers extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function summary(): object|array
     {
diff --git a/src/Resources/Resolution.php b/src/Resources/Resolution.php
index 84c55d7..fa86a48 100644
--- a/src/Resources/Resolution.php
+++ b/src/Resources/Resolution.php
@@ -8,9 +8,9 @@
 
 class Resolution extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function resolution(): object|array
     {
diff --git a/src/Resources/UserCountry.php b/src/Resources/UserCountry.php
index 731b2a4..366c79e 100644
--- a/src/Resources/UserCountry.php
+++ b/src/Resources/UserCountry.php
@@ -8,9 +8,9 @@
 
 class UserCountry extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function countries(): object|array
     {
diff --git a/src/Resources/UserLanguage.php b/src/Resources/UserLanguage.php
index 3936a50..e6f7fc9 100644
--- a/src/Resources/UserLanguage.php
+++ b/src/Resources/UserLanguage.php
@@ -8,9 +8,9 @@
 
 class UserLanguage extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function all(): object|array
     {
diff --git a/src/Resources/VisitFrequency.php b/src/Resources/VisitFrequency.php
index 5fc8b57..27bf244 100644
--- a/src/Resources/VisitFrequency.php
+++ b/src/Resources/VisitFrequency.php
@@ -8,9 +8,9 @@
 
 class VisitFrequency extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function all(): object|array
     {
diff --git a/src/Resources/VisitTime.php b/src/Resources/VisitTime.php
index 0f58a6e..761214d 100644
--- a/src/Resources/VisitTime.php
+++ b/src/Resources/VisitTime.php
@@ -12,9 +12,9 @@
  */
 class VisitTime extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function byLocalTime(): object|array
     {
diff --git a/src/Resources/VisitorInterest.php b/src/Resources/VisitorInterest.php
index d982619..06b01c5 100644
--- a/src/Resources/VisitorInterest.php
+++ b/src/Resources/VisitorInterest.php
@@ -12,9 +12,9 @@
  */
 class VisitorInterest extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function numberOfVisitsPerDuration(): object|array
     {
diff --git a/src/Resources/VisitsSummary.php b/src/Resources/VisitsSummary.php
index 16c19f9..c76b100 100644
--- a/src/Resources/VisitsSummary.php
+++ b/src/Resources/VisitsSummary.php
@@ -13,9 +13,9 @@
  */
 class VisitsSummary extends BaseResource
 {
-    use SelectsSites,
+    use SelectsDate,
         SelectsPeriod,
-        SelectsDate;
+        SelectsSites;
 
     public function all(): object|array
     {