diff --git a/CHANGELOG.md b/CHANGELOG.md
index 242a775..e340213 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,10 @@
+## [1.1.1-dev.1](https://github.com/ReVanced/revanced-library/compare/v1.1.0...v1.1.1-dev.1) (2023-10-04)
+
+
+### Performance Improvements
+
+* Use maps to set options ([13823b7](https://github.com/ReVanced/revanced-library/commit/13823b74db1de3a104b5022b6bf0db0ef945f47b))
+
 # [1.1.0](https://github.com/ReVanced/revanced-library/compare/v1.0.1...v1.1.0) (2023-10-01)
 
 
diff --git a/gradle.properties b/gradle.properties
index 24b8e24..5a45afe 100644
--- a/gradle.properties
+++ b/gradle.properties
@@ -1,4 +1,4 @@
 org.gradle.parallel = true
 org.gradle.caching = true
 kotlin.code.style = official
-version = 1.1.0
+version = 1.1.1-dev.1
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
index 76dc6de..4381d5d 100644
--- a/gradle/libs.versions.toml
+++ b/gradle/libs.versions.toml
@@ -5,7 +5,7 @@ jackson-module-kotlin = "2.14.3"
 jadb = "2531a28109"
 kotlin-reflect = "1.9.0"
 kotlin-test = "1.8.20-RC"
-revanced-patcher = "15.0.1"
+revanced-patcher = "16.0.0"
 binary-compatibility-validator = "0.13.2"
 
 [libraries]
diff --git a/src/main/kotlin/app/revanced/library/Options.kt b/src/main/kotlin/app/revanced/library/Options.kt
index 9ebdf94..59715f4 100644
--- a/src/main/kotlin/app/revanced/library/Options.kt
+++ b/src/main/kotlin/app/revanced/library/Options.kt
@@ -61,13 +61,15 @@ object Options {
         filter { it.options.any() }.let { patches ->
             if (patches.isEmpty()) return
 
-            val patchOptions = deserialize(json)
+            val jsonPatches = deserialize(json).associate {
+                it.patchName to it.options.associate { option -> option.key to option.value }
+            }
 
-            patches.forEach patch@{ patch ->
-                patchOptions.find { option -> option.patchName == patch.name!! }?.let {
-                    it.options.forEach { option ->
+            patches.forEach { patch ->
+                jsonPatches[patch.name]?.let { jsonPatchOptions ->
+                    jsonPatchOptions.forEach { (option, value) ->
                         try {
-                            patch.options[option.key] = option.value
+                            patch.options[option] = value
                         } catch (e: PatchOptionException) {
                             logger.severe(e.toString())
                         }