diff --git a/.github/workflows/analysis.yml b/.github/workflows/analysis.yml
index 23a8123..f20a6d0 100644
--- a/.github/workflows/analysis.yml
+++ b/.github/workflows/analysis.yml
@@ -7,7 +7,7 @@ jobs:
     name: Code Analysis
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@v2.3.4
+      - uses: actions/checkout@v4.1.1
       - uses: axel-op/dart-package-analyzer@v3
         id: analysis
         with:
diff --git a/.github/workflows/cd.yaml b/.github/workflows/cd.yaml
index fbc3771..c98a9d4 100644
--- a/.github/workflows/cd.yaml
+++ b/.github/workflows/cd.yaml
@@ -11,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v4.1.1
 
       - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@v1.5.0
+        uses: dart-lang/setup-dart@v1.6.0
 
       - name: ⏬ Get Depdendencies
         run: dart pub get
@@ -40,19 +40,19 @@ jobs:
     needs: [publish]
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v4.1.1
 
       - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@v1.5.0
+        uses: dart-lang/setup-dart@v1.6.0
 
       - name: 🧬 Generate docs
-        run: dartdoc --output docs
+        run: dart doc --output docs
 
       - name: 🌳 tree
         run: tree
 
       - name: 📢 Publish docs
-        uses: JamesIves/github-pages-deploy-action@v4.4.1
+        uses: JamesIves/github-pages-deploy-action@v4.5.0
         with:
           branch: docs
           folder: docs
diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml
index 99aa4a3..7802645 100644
--- a/.github/workflows/ci.yml
+++ b/.github/workflows/ci.yml
@@ -4,7 +4,6 @@ on:
   pull_request:
     branches:
       - master
-      - development
 
 jobs:
   tests:
@@ -12,10 +11,10 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: Checkout
-        uses: actions/checkout@v3.5.2
+        uses: actions/checkout@v4.1.1
 
       - name: Setup Dart SDK
-        uses: dart-lang/setup-dart@v1.5.0
+        uses: dart-lang/setup-dart@v1.6.0
 
       - name: ⏬ Install dependencies
         run: dart pub get
diff --git a/CHANGELOG.md b/CHANGELOG.md
index afc4dc1..282c394 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,9 @@
 # ChangeLog
 
+## 2.2.1
+
+- Fix Lints
+
 ## 2.2.0
 
 - Added `include_image_language` option to movie/tv `getDetails`. Thanks to ([@0Franky](https://github.com/0Franky))
diff --git a/lib/abs/catagory.dart b/lib/abs/catagory.dart
index ef46019..eda39f3 100644
--- a/lib/abs/catagory.dart
+++ b/lib/abs/catagory.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../tmdb_api.dart';
 
 /// Base calss of [Category]s
 abstract class Category<V extends Version> {
diff --git a/lib/abs/version.dart b/lib/abs/version.dart
index 81526d2..69ad230 100644
--- a/lib/abs/version.dart
+++ b/lib/abs/version.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../tmdb_api.dart';
 
 /// Base class of [Version]s
 abstract class Version {
diff --git a/lib/logger/logger.dart b/lib/logger/logger.dart
index c3c91a0..e3b0deb 100644
--- a/lib/logger/logger.dart
+++ b/lib/logger/logger.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../tmdb_api.dart';
 
 ///Configure the logs
 ///
diff --git a/lib/models/list_item.dart b/lib/models/list_item.dart
index 7f072cb..88eea70 100644
--- a/lib/models/list_item.dart
+++ b/lib/models/list_item.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../tmdb_api.dart';
 
 class ListItem {
   final MediaType mediaType;
@@ -36,11 +36,7 @@ class ListItem {
   ///}
   ///```
   Map<String, dynamic> _toMap() {
-    return {
-      'media_type': _getMediaType(mediaType),
-      'media_id': '$mediaId',
-      'comment': comment
-    };
+    return {'media_type': _getMediaType(mediaType), 'media_id': '$mediaId', 'comment': comment};
   }
 
   String _getMediaType(MediaType mediaType) {
diff --git a/lib/utils/api_keys.dart b/lib/utils/api_keys.dart
index 2cc82bf..fe0b624 100644
--- a/lib/utils/api_keys.dart
+++ b/lib/utils/api_keys.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../tmdb_api.dart';
 
 class ApiKeys {
   final String _apiKeyV3;
diff --git a/lib/utils/enums.dart b/lib/utils/enums.dart
index 4d20d2b..2b1ebdb 100644
--- a/lib/utils/enums.dart
+++ b/lib/utils/enums.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../tmdb_api.dart';
 
 //-------------------tmdb_api---------------------
 ///Http request methods
@@ -56,23 +56,9 @@ enum SortMoviesBy {
 }
 
 //movies.dart
-enum SortTvShowsBy {
-  voteAverageAsc,
-  voteAverageDesc,
-  popularityAsc,
-  popularityDesc,
-  firstAirDateAsc,
-  firstAirDateDesc
-}
+enum SortTvShowsBy { voteAverageAsc, voteAverageDesc, popularityAsc, popularityDesc, firstAirDateAsc, firstAirDateDesc }
 
-enum FilterTvShowsByStatus {
-  returningSeries,
-  planned,
-  inProduction,
-  ended,
-  cancelled,
-  pilot
-}
+enum FilterTvShowsByStatus { returningSeries, planned, inProduction, ended, cancelled, pilot }
 
 enum FilterTvShowsByType {
   documentary,
diff --git a/lib/utils/tmdb_exceptions.dart b/lib/utils/tmdb_exceptions.dart
index c7160a8..682921f 100644
--- a/lib/utils/tmdb_exceptions.dart
+++ b/lib/utils/tmdb_exceptions.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../tmdb_api.dart';
 
 ///Base exception
 class TMDBException<T> implements Exception {
@@ -16,10 +16,10 @@ class TMDBDioError extends TMDBException<DioException> {
   final int? statusCode;
 
   const TMDBDioError(
-    String message, {
-    required DioException orginal,
+    super.message, {
+    required DioException super.orginal,
     this.statusCode,
-  }) : super(message, orginal: orginal);
+  });
 
   @override
   String toString() => 'TMDBDioError(message: $message,orginal:$orginal, statusCode: $statusCode)';
@@ -27,10 +27,10 @@ class TMDBDioError extends TMDBException<DioException> {
 
 class TMDBOtherException extends TMDBException<dynamic> {
   const TMDBOtherException(
-    String message, {
-    dynamic orginal,
-    StackTrace? stackTrace,
-  }) : super(message, orginal: orginal, stackTrace: stackTrace);
+    super.message, {
+    super.orginal,
+    super.stackTrace,
+  });
   @override
   String toString() => 'TMDBDioError(message: $message,orginal:$orginal, stackTrace:$stackTrace)';
 }
diff --git a/lib/versions/v3.dart b/lib/versions/v3.dart
index 154f68e..7bbddbc 100644
--- a/lib/versions/v3.dart
+++ b/lib/versions/v3.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../tmdb_api.dart';
 
 class V3 extends Version {
   late Movies _movies;
diff --git a/lib/versions/v3/category/account.dart b/lib/versions/v3/category/account.dart
index ddb029d..fc3727c 100644
--- a/lib/versions/v3/category/account.dart
+++ b/lib/versions/v3/category/account.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Account extends Category<V3> {
   Account(V3 v) : super(v, 'account');
@@ -153,7 +153,7 @@ class Account extends Category<V3> {
         'session_id=$sessionId',
         'language=${language ?? _v._tmdb.defaultLanguage}',
         'page=$page',
-        'sort_by=$sort'
+        'sort_by=$sort',
       ],
     );
   }
@@ -210,7 +210,7 @@ class Account extends Category<V3> {
         'session_id=$sessionId',
         'language=${language ?? _v._tmdb.defaultLanguage}',
         'page=$page',
-        'sort_by=$sort'
+        'sort_by=$sort',
       ],
     );
   }
@@ -267,11 +267,7 @@ class Account extends Category<V3> {
       '$_endPoint/$accountId/favorite',
       method: HttpMethod.post,
       optionalQueries: ['session_id=$sessionId'],
-      postBody: {
-        'media_type': type,
-        'media_id': '$mediaId',
-        'favorite': '$isFavorite'
-      },
+      postBody: {'media_type': type, 'media_id': '$mediaId', 'favorite': '$isFavorite'},
     );
   }
 
@@ -395,7 +391,7 @@ class Account extends Category<V3> {
         'session_id=$sessionId',
         'language=${language ?? _v._tmdb.defaultLanguage}',
         'page=$page',
-        'sort_by=$sort'
+        'sort_by=$sort',
       ],
     );
   }
@@ -452,7 +448,7 @@ class Account extends Category<V3> {
         'session_id=$sessionId',
         'language=${language ?? _v._tmdb.defaultLanguage}',
         'page=$page',
-        'sort_by=$sort'
+        'sort_by=$sort',
       ],
     );
   }
@@ -528,7 +524,7 @@ class Account extends Category<V3> {
         'session_id=$sessionId',
         'language=${language ?? _v._tmdb.defaultLanguage}',
         'page=$page',
-        'sort_by=$sort'
+        'sort_by=$sort',
       ],
     );
   }
@@ -605,7 +601,7 @@ class Account extends Category<V3> {
         'session_id=$sessionId',
         'language=${language ?? _v._tmdb.defaultLanguage}',
         'page=$page',
-        'sort_by=$sort'
+        'sort_by=$sort',
       ],
     );
   }
diff --git a/lib/versions/v3/category/authentication.dart b/lib/versions/v3/category/authentication.dart
index 3357bb2..1fb2bfd 100644
--- a/lib/versions/v3/category/authentication.dart
+++ b/lib/versions/v3/category/authentication.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Auth extends Category<V3> {
   Auth(V3 v) : super(v, 'authentication');
diff --git a/lib/versions/v3/category/certification.dart b/lib/versions/v3/category/certification.dart
index a37b853..1835ae2 100644
--- a/lib/versions/v3/category/certification.dart
+++ b/lib/versions/v3/category/certification.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Certification extends Category<V3> {
   ///Provides details about movies
diff --git a/lib/versions/v3/category/changes.dart b/lib/versions/v3/category/changes.dart
index 8701ec9..f3117e6 100644
--- a/lib/versions/v3/category/changes.dart
+++ b/lib/versions/v3/category/changes.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Changes extends Category<V3> {
   ///Provides details about movies
diff --git a/lib/versions/v3/category/collections.dart b/lib/versions/v3/category/collections.dart
index f9c1984..3a33e2f 100644
--- a/lib/versions/v3/category/collections.dart
+++ b/lib/versions/v3/category/collections.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Collections extends Category<V3> {
   ///Provides details about movies
diff --git a/lib/versions/v3/category/companies.dart b/lib/versions/v3/category/companies.dart
index d67fb14..7bc0031 100644
--- a/lib/versions/v3/category/companies.dart
+++ b/lib/versions/v3/category/companies.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Companies extends Category<V3> {
   ///Provides details about movies
diff --git a/lib/versions/v3/category/credit.dart b/lib/versions/v3/category/credit.dart
index b62f8ba..02b7bc1 100644
--- a/lib/versions/v3/category/credit.dart
+++ b/lib/versions/v3/category/credit.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Credit extends Category<V3> {
   ///Provides details about movies
diff --git a/lib/versions/v3/category/discover.dart b/lib/versions/v3/category/discover.dart
index 060909e..9ac81ce 100644
--- a/lib/versions/v3/category/discover.dart
+++ b/lib/versions/v3/category/discover.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Discover extends Category<V3> {
   // final V3 _v;
diff --git a/lib/versions/v3/category/find.dart b/lib/versions/v3/category/find.dart
index f6b5ce8..ffc467a 100644
--- a/lib/versions/v3/category/find.dart
+++ b/lib/versions/v3/category/find.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Find extends Category<V3> {
   ///Provides details about movies
@@ -34,10 +34,7 @@ class Find extends Category<V3> {
   }) {
     return _v._query(
       '$_endPoint/$externalId',
-      optionalQueries: [
-        _getSourceQuery(externalIdSource),
-        'language=${language ?? _v._tmdb.defaultLanguage}'
-      ],
+      optionalQueries: [_getSourceQuery(externalIdSource), 'language=${language ?? _v._tmdb.defaultLanguage}'],
     );
   }
 
diff --git a/lib/versions/v3/category/genres.dart b/lib/versions/v3/category/genres.dart
index 1394e98..db3c652 100644
--- a/lib/versions/v3/category/genres.dart
+++ b/lib/versions/v3/category/genres.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Genres extends Category<V3> {
   ///Provides details about gemres
@@ -72,5 +72,5 @@ class Genres extends Category<V3> {
 }
 
 class Geners extends Genres {
-  Geners(V3 v) : super(v);
+  Geners(super.v);
 }
diff --git a/lib/versions/v3/category/guest_session.dart b/lib/versions/v3/category/guest_session.dart
index d8f4847..e4efff5 100644
--- a/lib/versions/v3/category/guest_session.dart
+++ b/lib/versions/v3/category/guest_session.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class GuestSession extends Category<V3> {
   ///Provides details about movies
@@ -45,7 +45,7 @@ class GuestSession extends Category<V3> {
       optionalQueries: [
         'guest_session_id=$guestSessionId',
         'language=${language ?? _v._tmdb.defaultLanguage}',
-        'sort_by=$sort'
+        'sort_by=$sort',
       ],
     );
   }
@@ -92,7 +92,7 @@ class GuestSession extends Category<V3> {
       optionalQueries: [
         'guest_session_id=$guestSessionId',
         'language=${language ?? _v._tmdb.defaultLanguage}',
-        'sort_by=$sort'
+        'sort_by=$sort',
       ],
     );
   }
@@ -139,7 +139,7 @@ class GuestSession extends Category<V3> {
       optionalQueries: [
         'guest_session_id=$guestSessionId',
         'language=${language ?? _v._tmdb.defaultLanguage}',
-        'sort_by=$sort'
+        'sort_by=$sort',
       ],
     );
   }
diff --git a/lib/versions/v3/category/images.dart b/lib/versions/v3/category/images.dart
index 633e1c1..0c1f26c 100644
--- a/lib/versions/v3/category/images.dart
+++ b/lib/versions/v3/category/images.dart
@@ -1,5 +1,5 @@
 // ignore_for_file: constant_identifier_names
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Images {
   final String _baseUrl = 'https://image.tmdb.org/t/p';
diff --git a/lib/versions/v3/category/keywords.dart b/lib/versions/v3/category/keywords.dart
index f6f2d26..2b9ac4b 100644
--- a/lib/versions/v3/category/keywords.dart
+++ b/lib/versions/v3/category/keywords.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Keywords extends Category<V3> {
   ///Provides details about movies
@@ -40,10 +40,7 @@ class Keywords extends Category<V3> {
   }) {
     return _v._query(
       '$_endPoint/$keywordId',
-      optionalQueries: [
-        'include_adult=$includeAdult',
-        'language=${language ?? _v._tmdb.defaultLanguage}'
-      ],
+      optionalQueries: ['include_adult=$includeAdult', 'language=${language ?? _v._tmdb.defaultLanguage}'],
     );
   }
 }
diff --git a/lib/versions/v3/category/lists.dart b/lib/versions/v3/category/lists.dart
index 14ee477..20236b2 100644
--- a/lib/versions/v3/category/lists.dart
+++ b/lib/versions/v3/category/lists.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Lists extends Category<V3> {
   Lists(V3 v) : super(v, 'list');
diff --git a/lib/versions/v3/category/movies.dart b/lib/versions/v3/category/movies.dart
index 354652b..bd7a608 100644
--- a/lib/versions/v3/category/movies.dart
+++ b/lib/versions/v3/category/movies.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Movies extends Category<V3> {
   ///Provides details about movies
@@ -194,10 +194,7 @@ class Movies extends Category<V3> {
 
     return _v._query(
       '$_endPoint/$movieId/recommendations',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -230,10 +227,7 @@ class Movies extends Category<V3> {
 
     return _v._query(
       '$_endPoint/$movieId/similar',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -265,10 +259,7 @@ class Movies extends Category<V3> {
 
     return _v._query(
       '$_endPoint/$movieId/reviews',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -299,10 +290,7 @@ class Movies extends Category<V3> {
 
     return _v._query(
       '$_endPoint/$movieId/lists',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -359,10 +347,7 @@ class Movies extends Category<V3> {
       throw ArgumentError('movieId < 1 || page < 1 || page > 1000 is true');
     }
 
-    final para = <String>[
-      'language=${language ?? _v._tmdb.defaultLanguage}',
-      'page=$page'
-    ];
+    final para = <String>['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'];
     if (region != null) {
       para.add('region=$region');
     }
@@ -426,10 +411,7 @@ class Movies extends Category<V3> {
       throw ArgumentError('movieId < 1 || page < 1 || page > 1000 is true');
     }
 
-    final para = <String>[
-      'language=${language ?? _v._tmdb.defaultLanguage}',
-      'page=$page'
-    ];
+    final para = <String>['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'];
     if (region != null) {
       para.add('region=$region');
     }
@@ -463,10 +445,7 @@ class Movies extends Category<V3> {
       throw ArgumentError('movieId < 1 || page < 1 || page > 1000 is true');
     }
 
-    final para = <String>[
-      'language=${language ?? _v._tmdb.defaultLanguage}',
-      'page=$page'
-    ];
+    final para = <String>['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'];
     if (region != null) {
       para.add('region=$region');
     }
@@ -507,10 +486,7 @@ class Movies extends Category<V3> {
       throw ArgumentError('movieId < 1 || page < 1 || page > 1000 is true');
     }
 
-    final para = <String>[
-      'language=${language ?? _v._tmdb.defaultLanguage}',
-      'page=$page'
-    ];
+    final para = <String>['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'];
     if (region != null) {
       para.add('region=$region');
     }
diff --git a/lib/versions/v3/category/networks.dart b/lib/versions/v3/category/networks.dart
index cf468c9..1758fe6 100644
--- a/lib/versions/v3/category/networks.dart
+++ b/lib/versions/v3/category/networks.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Networks extends Category<V3> {
   Networks(V3 v) : super(v, 'network');
diff --git a/lib/versions/v3/category/people.dart b/lib/versions/v3/category/people.dart
index 6a078d0..9376a33 100644
--- a/lib/versions/v3/category/people.dart
+++ b/lib/versions/v3/category/people.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class People extends Category<V3> {
   // final V3 _v;
@@ -201,10 +201,7 @@ class People extends Category<V3> {
 
     return _v._query(
       '$_endPoint/$personId/tagged_images',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -266,10 +263,7 @@ class People extends Category<V3> {
   Future<Map> getPopular({String? language, int page = 1}) {
     return _v._query(
       '$_endPoint/popular',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 }
diff --git a/lib/versions/v3/category/reviews.dart b/lib/versions/v3/category/reviews.dart
index e38c824..ba1b814 100644
--- a/lib/versions/v3/category/reviews.dart
+++ b/lib/versions/v3/category/reviews.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Reviews extends Category<V3> {
   ///Provides details about movies
diff --git a/lib/versions/v3/category/search.dart b/lib/versions/v3/category/search.dart
index 808e7c6..cc356d5 100644
--- a/lib/versions/v3/category/search.dart
+++ b/lib/versions/v3/category/search.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Search extends Category<V3> {
   Search(V3 v) : super(v, 'search');
@@ -50,11 +50,7 @@ class Search extends Category<V3> {
 
     return _v._query(
       '$_endPoint/collection',
-      optionalQueries: [
-        'query=$query',
-        'page=$page',
-        'language=${language ?? _v._tmdb.defaultLanguage}'
-      ],
+      optionalQueries: ['query=$query', 'page=$page', 'language=${language ?? _v._tmdb.defaultLanguage}'],
     );
   }
 
@@ -168,7 +164,7 @@ class Search extends Category<V3> {
       'query=$query',
       'includeAdult=$includeAdult',
       'language=${language ?? _v._tmdb.defaultLanguage}',
-      'page=$page'
+      'page=$page',
     ];
     //null parameters
     if (region != null) {
@@ -210,7 +206,7 @@ class Search extends Category<V3> {
       'query=$query',
       'includeAdult=$includeAdult',
       'language=${language ?? _v._tmdb.defaultLanguage}',
-      'page=$page'
+      'page=$page',
     ];
     if (region != null) {
       optionalQueries.add('region=$region');
@@ -246,11 +242,7 @@ class Search extends Category<V3> {
     String? language,
     int page = 1,
   }) {
-    final optionalQueries = <String>[
-      'query=$query',
-      'language=${language ?? _v._tmdb.defaultLanguage}',
-      'page=$page'
-    ];
+    final optionalQueries = <String>['query=$query', 'language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'];
     if (firstAirDateYear != null) {
       optionalQueries.add('first_air_date_year=$firstAirDateYear');
     }
diff --git a/lib/versions/v3/category/trending.dart b/lib/versions/v3/category/trending.dart
index 621f8c2..6562dce 100644
--- a/lib/versions/v3/category/trending.dart
+++ b/lib/versions/v3/category/trending.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Trending extends Category<V3> {
   Trending(V3 v) : super(v, 'trending');
@@ -35,10 +35,7 @@ class Trending extends Category<V3> {
   }) {
     return _v._query(
       '$_endPoint/${_getMediaType(mediaType)}/${_getTimeWindow(timeWindow)}',
-      optionalQueries: [
-        'page=$page',
-        'language=${language ?? _v._tmdb.defaultLanguage}'
-      ],
+      optionalQueries: ['page=$page', 'language=${language ?? _v._tmdb.defaultLanguage}'],
     );
   }
 
diff --git a/lib/versions/v3/category/tv.dart b/lib/versions/v3/category/tv.dart
index fa8ba1a..930857e 100644
--- a/lib/versions/v3/category/tv.dart
+++ b/lib/versions/v3/category/tv.dart
@@ -1,5 +1,5 @@
 //tv shows
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class Tv extends Category<V3> {
   Tv(V3 v) : super(v, 'tv');
@@ -32,7 +32,7 @@ class Tv extends Category<V3> {
     if (appendToResponse != null) {
       para.add('append_to_response=$appendToResponse');
     }
-    
+
     if (includeImageLanguage != null) {
       para.add('include_image_language=$includeImageLanguage');
     }
@@ -211,10 +211,7 @@ class Tv extends Category<V3> {
 
     return _v._query(
       '$_endPoint/$tvId/recommendations',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -239,10 +236,7 @@ class Tv extends Category<V3> {
 
     return _v._query(
       '$_endPoint/$tvId/reviews',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -287,10 +281,7 @@ class Tv extends Category<V3> {
 
     return _v._query(
       '$_endPoint/$tvId/similar',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -411,10 +402,7 @@ class Tv extends Category<V3> {
 
     return _v._query(
       '$_endPoint/popular',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -438,10 +426,7 @@ class Tv extends Category<V3> {
 
     return _v._query(
       '$_endPoint/top_rated',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -466,10 +451,7 @@ class Tv extends Category<V3> {
     }
     return _v._query(
       '$_endPoint/airing_today',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
@@ -494,10 +476,7 @@ class Tv extends Category<V3> {
     }
     return _v._query(
       '$_endPoint/on_the_air',
-      optionalQueries: [
-        'language=${language ?? _v._tmdb.defaultLanguage}',
-        'page=$page'
-      ],
+      optionalQueries: ['language=${language ?? _v._tmdb.defaultLanguage}', 'page=$page'],
     );
   }
 
diff --git a/lib/versions/v3/category/tv_episode_group.dart b/lib/versions/v3/category/tv_episode_group.dart
index 8ffb9f8..e2db0a4 100644
--- a/lib/versions/v3/category/tv_episode_group.dart
+++ b/lib/versions/v3/category/tv_episode_group.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class TvEpisodeGroup extends Category<V3> {
   //!test failed
diff --git a/lib/versions/v3/category/tv_episodes.dart b/lib/versions/v3/category/tv_episodes.dart
index 0ac5f9f..85fe38f 100644
--- a/lib/versions/v3/category/tv_episodes.dart
+++ b/lib/versions/v3/category/tv_episodes.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class TvEpisodes extends Category<V3> {
   TvEpisodes(V3 v) : super(v, 'episode');
diff --git a/lib/versions/v3/category/tv_seasons.dart b/lib/versions/v3/category/tv_seasons.dart
index 1be338d..58ca1eb 100644
--- a/lib/versions/v3/category/tv_seasons.dart
+++ b/lib/versions/v3/category/tv_seasons.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class TvSeasons extends Category<V3> {
   TvSeasons(V3 v) : super(v, 'season');
diff --git a/lib/versions/v3/category/watch_providers.dart b/lib/versions/v3/category/watch_providers.dart
index f6b0dcb..37dc6cb 100644
--- a/lib/versions/v3/category/watch_providers.dart
+++ b/lib/versions/v3/category/watch_providers.dart
@@ -1,5 +1,5 @@
 //tv shows
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 /// Watch Providers
 class WatchProviders extends Category<V3> {
diff --git a/lib/versions/v4.dart b/lib/versions/v4.dart
index c7d03c6..6a1c90b 100644
--- a/lib/versions/v4.dart
+++ b/lib/versions/v4.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../tmdb_api.dart';
 
 class V4 extends Version {
   late AccountV4 _accountV4;
diff --git a/lib/versions/v4/category/account.dart b/lib/versions/v4/category/account.dart
index cbac922..bdad252 100644
--- a/lib/versions/v4/category/account.dart
+++ b/lib/versions/v4/category/account.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class AccountV4 extends Category<V4> {
   // final V4 _v;
diff --git a/lib/versions/v4/category/auth.dart b/lib/versions/v4/category/auth.dart
index 3444791..b0463a6 100644
--- a/lib/versions/v4/category/auth.dart
+++ b/lib/versions/v4/category/auth.dart
@@ -1,4 +1,4 @@
-part of tmdb_api;
+part of '../../../tmdb_api.dart';
 
 class AuthV4 extends Category<V4> {
   // final V4 _v;
@@ -39,7 +39,7 @@ class AuthV4 extends Category<V4> {
 
     final postHeaders = <String, String>{
       'Content-Type': 'application/json;charset=utf-8',
-      'Authorization': 'Bearer $accessToken'
+      'Authorization': 'Bearer $accessToken',
     };
     return _v._query(
       '$_endPoint/request_token',
@@ -78,7 +78,7 @@ class AuthV4 extends Category<V4> {
 
     final postHeaders = <String, String>{
       'Content-Type': 'application/json;charset=utf-8',
-      'Authorization': 'Bearer $v4ApiToken'
+      'Authorization': 'Bearer $v4ApiToken',
     };
     return _v._query(
       '$_endPoint/access_token',
@@ -113,10 +113,7 @@ class AuthV4 extends Category<V4> {
     return _v._query(
       '$_endPoint/access_token',
       method: HttpMethod.delete,
-      deleteHeaders: {
-        'Content-Type': 'application/json;charset=utf-8',
-        'Authorization': 'Bearer $v4ApiToken'
-      },
+      deleteHeaders: {'Content-Type': 'application/json;charset=utf-8', 'Authorization': 'Bearer $v4ApiToken'},
       deleteBody: {'access_token': accessToken},
     );
   }
diff --git a/lib/versions/v4/category/lists.dart b/lib/versions/v4/category/lists.dart
index 2b85118..b7c8d2f 100644
--- a/lib/versions/v4/category/lists.dart
+++ b/lib/versions/v4/category/lists.dart
@@ -1,5 +1,5 @@
-// ignore_for_file: use_late_for_private_fields_and_variables
-part of tmdb_api;
+// ignore_for_file: use_late_for_private_fields_and_variables, require_trailing_commas
+part of '../../../tmdb_api.dart';
 
 class ListsV4 extends Category<V4> {
   // final V4 _v;
@@ -488,10 +488,7 @@ class ListsV4 extends Category<V4> {
         'Authorization': 'Bearer $accessToken',
         'Content-Type': 'application/json;charset=utf-8',
       },
-      optionalQueries: [
-        'media_id=$mediaId',
-        'media_type=${_getMediaType(MediaType.movie)}'
-      ],
+      optionalQueries: ['media_id=$mediaId', 'media_type=${_getMediaType(MediaType.movie)}'],
     );
   }
 
diff --git a/pubspec.yaml b/pubspec.yaml
index aeade9a..2d62f78 100644
--- a/pubspec.yaml
+++ b/pubspec.yaml
@@ -1,6 +1,6 @@
 name: tmdb_api
 description: Dart client-side API package for TMDB.org API (https://www.themoviedb.org/).
-version: 2.2.0
+version: 2.2.1
 homepage: https://github.com/RatakondalaArun/tmdb_api.git
 issue_tracker: https://github.com/RatakondalaArun/tmdb_api/issues
 
diff --git a/test/tmdb_api_test.dart b/test/tmdb_api_test.dart
index 81f7da4..01f31f1 100644
--- a/test/tmdb_api_test.dart
+++ b/test/tmdb_api_test.dart
@@ -1,4 +1,6 @@
 @Skip('No tests')
+library;
+
 import 'package:test/test.dart';
 import 'package:tmdb_api/tmdb_api.dart';
 
diff --git a/test/versions/v3/category/account_test.dart b/test/versions/v3/category/account_test.dart
index 19f0cb6..805650b 100644
--- a/test/versions/v3/category/account_test.dart
+++ b/test/versions/v3/category/account_test.dart
@@ -1,4 +1,6 @@
 @Skip('Only manual tests are possible Because of auth tokens')
+library;
+
 import 'package:test/test.dart';
 import 'package:tmdb_api/tmdb_api.dart';
 
diff --git a/test/versions/v3/category/authentication_test.dart b/test/versions/v3/category/authentication_test.dart
index e49b2ab..b735e6e 100644
--- a/test/versions/v3/category/authentication_test.dart
+++ b/test/versions/v3/category/authentication_test.dart
@@ -1,4 +1,5 @@
 @Skip('Only manual tests are possible')
+library;
 
 import 'package:test/test.dart';
 import 'package:tmdb_api/tmdb_api.dart';
diff --git a/test/versions/v3/category/guest_session_test.dart b/test/versions/v3/category/guest_session_test.dart
index 7918d8e..73c1900 100644
--- a/test/versions/v3/category/guest_session_test.dart
+++ b/test/versions/v3/category/guest_session_test.dart
@@ -1,4 +1,6 @@
 @Skip('Only manual tests are possible')
+library;
+
 import 'package:test/test.dart';
 import 'package:tmdb_api/tmdb_api.dart';
 
diff --git a/test/versions/v3/category/lists_test.dart b/test/versions/v3/category/lists_test.dart
index 2c1c55f..5afcead 100644
--- a/test/versions/v3/category/lists_test.dart
+++ b/test/versions/v3/category/lists_test.dart
@@ -1,4 +1,6 @@
 @Skip('Only manual tests are possible')
+library;
+
 import 'package:test/test.dart';
 import 'package:tmdb_api/tmdb_api.dart';
 
diff --git a/test/versions/v3/category/tv_episode_group_test.dart b/test/versions/v3/category/tv_episode_group_test.dart
index 7fac484..574358e 100644
--- a/test/versions/v3/category/tv_episode_group_test.dart
+++ b/test/versions/v3/category/tv_episode_group_test.dart
@@ -1,4 +1,5 @@
 @Skip('Only manual tests are possible')
+library;
 
 import 'package:test/test.dart';
 // import 'package:tmdb_api/tmdb_api.dart';
diff --git a/test/versions/v4/category/account_test.dart b/test/versions/v4/category/account_test.dart
index 7087dcd..edd9a00 100644
--- a/test/versions/v4/category/account_test.dart
+++ b/test/versions/v4/category/account_test.dart
@@ -1,4 +1,6 @@
 @Skip('Only manual tests are possible')
+library;
+
 import 'package:test/test.dart';
 import 'package:tmdb_api/tmdb_api.dart';
 
diff --git a/test/versions/v4/category/auth_test.dart b/test/versions/v4/category/auth_test.dart
index c5b7ba3..5246eb3 100644
--- a/test/versions/v4/category/auth_test.dart
+++ b/test/versions/v4/category/auth_test.dart
@@ -1,4 +1,6 @@
 @Skip('Only manual tests are possible')
+library;
+
 import 'package:test/test.dart';
 import 'package:tmdb_api/tmdb_api.dart';
 
diff --git a/test/versions/v4/category/lists_test.dart b/test/versions/v4/category/lists_test.dart
index d491f2f..b1fb869 100644
--- a/test/versions/v4/category/lists_test.dart
+++ b/test/versions/v4/category/lists_test.dart
@@ -1,4 +1,6 @@
 @Skip('Only manual tests are possible')
+library;
+
 import 'package:test/test.dart';
 import 'package:tmdb_api/tmdb_api.dart';