diff --git a/source/Constants.cpp b/source/Constants.cpp
index 0709c493..943756e9 100644
--- a/source/Constants.cpp
+++ b/source/Constants.cpp
@@ -34,6 +34,19 @@ get_activity_routing_methods() {
       {"Landroid/app/Activity;.startActivity:(Landroid/content/Intent;)V", 1},
   };
 }
+
+const std::unordered_map<std::string, ParameterPosition>&
+get_intent_class_setters() {
+  static const std::unordered_map<std::string, ParameterPosition> intent_class_setters =
+      {{"Landroid/content/Intent;.<init>:(Landroid/content/Context;Ljava/lang/Class;)V",
+        2},
+       {"Landroid/content/Intent;.<init>:(Ljava/lang/String;Landroid/net/Uri;Landroid/content/Context;Ljava/lang/Class;)V",
+        4},
+       {"Landroid/content/Intent;.setClass:(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;",
+        2}};
+  return intent_class_setters;
+}
+
 #endif
 
 } // namespace constants
diff --git a/source/Constants.h b/source/Constants.h
index d743c486..182a0013 100644
--- a/source/Constants.h
+++ b/source/Constants.h
@@ -33,6 +33,8 @@ std::string_view get_privacy_decision_type();
 // needs to be known.
 std::unordered_map<std::string, ParameterPosition>
 get_activity_routing_methods();
+const std::unordered_map<std::string, ParameterPosition>&
+get_intent_class_setters();
 
 } // namespace constants
 } // namespace marianatrench
diff --git a/source/IntentRoutingAnalyzer.cpp b/source/IntentRoutingAnalyzer.cpp
index 4a830087..2026d044 100644
--- a/source/IntentRoutingAnalyzer.cpp
+++ b/source/IntentRoutingAnalyzer.cpp
@@ -110,22 +110,23 @@ class Transfer final : public InstructionAnalyzerBase<
     if (method == nullptr || method->get_class() == nullptr) {
       return false;
     }
-    // Handle new Intent(context, C.class) and intent.setClass(context,
-    // C.class).
-    if (method->get_class()->get_name()->str() == ANDROID_INTENT_CLASS &&
-        (method->get_name()->str() == "<init>" ||
-         method->get_name()->str() == "setClass")) {
+
+    const auto& intent_class_setters = constants::get_intent_class_setters();
+    auto intent_parameter_position = intent_class_setters.find(show(method));
+    if (intent_parameter_position != intent_class_setters.end()) {
+      auto class_index = intent_parameter_position->second;
+
+      mt_assert(class_index > 0);
+      mt_assert(!::is_static(method));
+
       const auto dex_arguments = method->get_proto()->get_args();
-      if (dex_arguments->size() != 2) {
-        return false;
-      }
-      const std::size_t class_index = 1;
-      if (dex_arguments->at(class_index) != type::java_lang_Class()) {
+      if (dex_arguments->at(class_index - 1) != type::java_lang_Class()) {
         return false;
       }
       const auto& environment = context->types().const_class_environment(
           context->method(), instruction);
-      auto found = environment.find(instruction->src(class_index + 1));
+      mt_assert(class_index < instruction->srcs_size());
+      auto found = environment.find(instruction->src(class_index));
       if (found == environment.end()) {
         return false;
       }
diff --git a/source/tests/IntentRoutingAnalyzerTest.cpp b/source/tests/IntentRoutingAnalyzerTest.cpp
index 55df53ff..0503ad07 100644
--- a/source/tests/IntentRoutingAnalyzerTest.cpp
+++ b/source/tests/IntentRoutingAnalyzerTest.cpp
@@ -153,7 +153,7 @@ TEST_F(IntentRoutingAnalyzerTest, IntentRoutingSetClass) {
             )
             ))",
           R"(
-            (method (public) "Landroid/content/Intent;.setClass:(Landroid/content/Context;Ljava/lang/Class;)V"
+            (method (public) "Landroid/content/Intent;.setClass:(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;"
             (
               (return-void)
             )
@@ -173,7 +173,7 @@ TEST_F(IntentRoutingAnalyzerTest, IntentRoutingSetClass) {
               (move-result-pseudo-object v1)
               (const-class "LRouteTo;")
               (move-result-pseudo-object v2)
-              (invoke-direct (v0 v1 v2) "Landroid/content/Intent;.setClass:(Landroid/content/Context;Ljava/lang/Class;)V")
+              (invoke-direct (v0 v1 v2) "Landroid/content/Intent;.setClass:(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;")
               (return-void)
             )
             ))",
diff --git a/source/tests/ShimsTest.cpp b/source/tests/ShimsTest.cpp
index 520a1110..38958967 100644
--- a/source/tests/ShimsTest.cpp
+++ b/source/tests/ShimsTest.cpp
@@ -108,7 +108,7 @@ TEST_F(ShimsTest, TestBuildCrossComponentAnalysisShims) {
             )
             ))",
           R"(
-            (method (public) "Landroid/content/Intent;.setClass:(Landroid/content/Context;Ljava/lang/Class;)V"
+            (method (public) "Landroid/content/Intent;.setClass:(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;"
             (
               (return-void)
             )
@@ -141,7 +141,7 @@ TEST_F(ShimsTest, TestBuildCrossComponentAnalysisShims) {
               (move-result-pseudo-object v1)
               (const-class "LRouteTo;")
               (move-result-pseudo-object v2)
-              (invoke-direct (v0 v1 v2) "Landroid/content/Intent;.setClass:(Landroid/content/Context;Ljava/lang/Class;)V")
+              (invoke-direct (v0 v1 v2) "Landroid/content/Intent;.setClass:(Landroid/content/Context;Ljava/lang/Class;)Landroid/content/Intent;")
               (return-void)
             )
             ))",