diff --git a/source/funkin/backend/scripting/ModState.hx b/source/funkin/backend/scripting/ModState.hx
index adc0a42c..94a6ac7b 100644
--- a/source/funkin/backend/scripting/ModState.hx
+++ b/source/funkin/backend/scripting/ModState.hx
@@ -1,10 +1,38 @@
 package funkin.backend.scripting;
 
 class ModState extends MusicBeatState {
+
+	/**
+	* Name of HScript file in assets/data/states.
+	*/
 	public static var lastName:String = null;
-	public function new(stateName:String) {
-		if (stateName != null)
-			lastName = stateName;
+	/**
+	* Last Optional extra data.
+	*/
+	public static var lastData:Dynamic = null;
+
+	/**
+	* Optional extra data.
+	*/
+	public var data:Dynamic = null;
+
+	/**
+	* ModState Constructor.
+	* Inherits from MusicBeatState and allows the execution of an HScript from assets/data/states passed via parameters.
+	*
+	* @param _stateName Name or path to a HScript file from assets/data/states.
+	* @param _data Optional extra Dynamic data passed from a previous state (JSON suggested).
+	*/
+	public function new(_stateName:String, ?_data:Dynamic) {
+		if(_stateName != null && _stateName != lastName) {
+			lastName = _stateName;
+			lastData = null;
+		}
+
+		if(_data != null)
+			lastData = _data;
+
+		data = lastData;
 		super(true, lastName);
 	}
 }
\ No newline at end of file
diff --git a/source/funkin/backend/scripting/ModSubState.hx b/source/funkin/backend/scripting/ModSubState.hx
index 5f06072c..acd90f62 100644
--- a/source/funkin/backend/scripting/ModSubState.hx
+++ b/source/funkin/backend/scripting/ModSubState.hx
@@ -1,10 +1,38 @@
 package funkin.backend.scripting;
 
 class ModSubState extends MusicBeatSubstate {
+
+	/**
+	* Name of HScript file in assets/data/states.
+	*/
 	public static var lastName:String = null;
-	public function new(stateName:String) {
-		if (stateName != null)
-			lastName = stateName;
+	/**
+	* Last Optional extra data.
+	*/
+	public static var lastData:Dynamic = null;
+
+	/**
+	* Optional extra data.
+	*/
+	public var data:Dynamic = null;
+
+	/**
+	* ModSubState Constructor.
+	* Inherits from MusicBeatSubstate and allows the execution of an HScript from assets/data/states passed via parameters.
+	*
+	* @param _stateName Name or path to a HScript file from assets/data/states.
+	* @param _data Optional extra Dynamic data passed from a previous state (JSON suggested).
+	*/
+	public function new(_stateName:String, ?_data:Dynamic) {
+		if(_stateName != null && _stateName != lastName) {
+			lastName = _stateName;
+			lastData = null;
+		}
+
+		if(_data != null)
+			lastData = _data;
+
+		data = lastData;
 		super(true, lastName);
 	}
 }
\ No newline at end of file