diff --git a/lib/src/models/_models.g.dart b/lib/src/models/_models.g.dart
index 85b05ce..91ce0bc 100644
--- a/lib/src/models/_models.g.dart
+++ b/lib/src/models/_models.g.dart
@@ -268,19 +268,10 @@ Map<String, dynamic> _$StartOrResumeOptionsToJson(
       'position_ms': instance.positionMs,
     };
 
-UriOffset _$UriOffsetFromJson(Map<String, dynamic> json) => UriOffset(
-      json['uri'] as String,
-    );
-
 Map<String, dynamic> _$UriOffsetToJson(UriOffset instance) => <String, dynamic>{
       'uri': instance.uri,
     };
 
-PositionOffset _$PositionOffsetFromJson(Map<String, dynamic> json) =>
-    PositionOffset(
-      json['position'] as int,
-    );
-
 Map<String, dynamic> _$PositionOffsetToJson(PositionOffset instance) =>
     <String, dynamic>{
       'position': instance.position,
diff --git a/lib/src/models/player.dart b/lib/src/models/player.dart
index a820e55..90c4e3c 100644
--- a/lib/src/models/player.dart
+++ b/lib/src/models/player.dart
@@ -144,36 +144,39 @@ class StartOrResumeOptions extends Object {
   Map<String, dynamic> toJson() => _$StartOrResumeOptionsToJson(this);
 
   static Map<String, dynamic> _offsetToJson(Offset? offset) {
-    if (offset is UriOffset) {
-      return {'uri': offset.uri};
-    } else if (offset is PositionOffset) {
-      return {'position': offset.position};
-    } else {
-      return {};
-    }
+    return offset?.toJson() ?? {};
   }
 }
 
-abstract class Offset {}
+abstract class Offset {
+  Map<String, dynamic> toJson();
+}
 
 /// "uri" is a string representing the uri of the item to start at.
 /// Example: "spotify:track:1301WleyT98MSxVHPZCA6M"
-@JsonSerializable()
+@JsonSerializable(createFactory: false)
 class UriOffset extends Offset {
   final String uri;
 
   UriOffset(this.uri);
+
+  @override
+  Map<String, dynamic> toJson() => _$UriOffsetToJson(this);
 }
 
 /// "position" is zero based and can’t be negative.
-@JsonSerializable()
+@JsonSerializable(createFactory: false)
 class PositionOffset extends Offset {
   final int position;
 
   PositionOffset(this.position) {
     assert(position >= 0, 'Position must be greater than or equal to 0');
   }
+
+  @override
+  Map<String, dynamic> toJson() => _$PositionOffsetToJson(this);
 }
+
 /// Representation of the current repeat state
 enum RepeatState { off, context, track }