diff --git a/lib/Model.php b/lib/Model.php
index cd5ea2a8..044adcd4 100644
--- a/lib/Model.php
+++ b/lib/Model.php
@@ -1481,7 +1481,7 @@ public function reset_dirty(): void
     /**
      * Enables the use of dynamic finders.
      *
-     * @see Relation->__call()
+     * @see Relation::__call()
      */
     public static function __callStatic(string $method, mixed $args): static|null
     {
diff --git a/lib/PhpStan/Model/ModelDynamicStaticMethodReturnTypeReflection.php b/lib/PhpStan/Model/ModelDynamicStaticMethodReturnTypeReflection.php
index c351a14c..93de04b0 100644
--- a/lib/PhpStan/Model/ModelDynamicStaticMethodReturnTypeReflection.php
+++ b/lib/PhpStan/Model/ModelDynamicStaticMethodReturnTypeReflection.php
@@ -3,6 +3,7 @@
 namespace ActiveRecord\PhpStan\Model;
 
 use ActiveRecord\Model;
+use ActiveRecord\PhpStan\Relation\RelationReflectionHelper;
 use PhpParser\Node\Expr\StaticCall;
 use PhpParser\Node\Identifier;
 use PhpParser\Node\Name;
diff --git a/lib/PhpStan/Model/ModelMethodsClassReflectionExtension.php b/lib/PhpStan/Model/ModelMethodsClassReflectionExtension.php
index e5d9b1ee..a5008fd7 100644
--- a/lib/PhpStan/Model/ModelMethodsClassReflectionExtension.php
+++ b/lib/PhpStan/Model/ModelMethodsClassReflectionExtension.php
@@ -3,6 +3,7 @@
 namespace ActiveRecord\PhpStan\Model;
 
 use ActiveRecord\Model;
+use ActiveRecord\Relation;
 use PHPStan\Reflection\ClassReflection;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\Reflection\MethodsClassReflectionExtension;
@@ -11,7 +12,7 @@ class ModelMethodsClassReflectionExtension implements MethodsClassReflectionExte
 {
     public function hasMethod(ClassReflection $classReflection, string $methodName): bool
     {
-        if ($classReflection->isSubclassOf(Model::class)) {
+        if ($classReflection->isSubclassOf(Model::class) || $classReflection->is(Relation::class)) {
             if (preg_match('/\bfind_by_/', $methodName)) {
                 return true;
             }
diff --git a/lib/PhpStan/Model/ModelStaticMethodReflection.php b/lib/PhpStan/Model/ModelStaticMethodReflection.php
index 8b58cc0c..9c39d850 100644
--- a/lib/PhpStan/Model/ModelStaticMethodReflection.php
+++ b/lib/PhpStan/Model/ModelStaticMethodReflection.php
@@ -10,9 +10,7 @@
 use PHPStan\Reflection\FunctionVariant;
 use PHPStan\Reflection\MethodReflection;
 use PHPStan\TrinaryLogic;
-use PHPStan\Type\ArrayType;
 use PHPStan\Type\Generic\TemplateTypeMap;
-use PHPStan\Type\IntegerType;
 use PHPStan\Type\NullType;
 use PHPStan\Type\ObjectType;
 use PHPStan\Type\UnionType;
@@ -126,21 +124,6 @@ public function getVariants(): array
                     ])
                 )
             ];
-        } elseif (str_starts_with($this->name, 'find_all')) {
-            $parts = SQLBuilder::underscored_string_to_parts(substr($this->name, 9), 0);
-
-            return [
-                new FunctionVariant(
-                    TemplateTypeMap::createEmpty(),
-                    TemplateTypeMap::createEmpty(),
-                    array_fill(0, count($parts), new ModelParameterReflection()),
-                    false,
-                    new ArrayType(
-                        new IntegerType(),
-                        new ObjectType($this->classReflection->getDisplayName()),
-                    )
-                )
-            ];
         } elseif (preg_match('/_set$/', $this->name)) {
             return [
                 new FunctionVariant(
diff --git a/lib/PhpStan/Model/RelationDynamicMethodReturnTypeReflection.php b/lib/PhpStan/Relation/RelationDynamicMethodReturnTypeReflection.php
similarity index 97%
rename from lib/PhpStan/Model/RelationDynamicMethodReturnTypeReflection.php
rename to lib/PhpStan/Relation/RelationDynamicMethodReturnTypeReflection.php
index a9883aba..b81d1773 100644
--- a/lib/PhpStan/Model/RelationDynamicMethodReturnTypeReflection.php
+++ b/lib/PhpStan/Relation/RelationDynamicMethodReturnTypeReflection.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActiveRecord\PhpStan\Model;
+namespace ActiveRecord\PhpStan\Relation;
 
 use ActiveRecord\Relation;
 use PhpParser\Node\Expr\MethodCall;
diff --git a/lib/PhpStan/Model/RelationReflectionHelper.php b/lib/PhpStan/Relation/RelationReflectionHelper.php
similarity index 98%
rename from lib/PhpStan/Model/RelationReflectionHelper.php
rename to lib/PhpStan/Relation/RelationReflectionHelper.php
index d86e51a0..4e0849f6 100644
--- a/lib/PhpStan/Model/RelationReflectionHelper.php
+++ b/lib/PhpStan/Relation/RelationReflectionHelper.php
@@ -1,6 +1,6 @@
 <?php
 
-namespace ActiveRecord\PhpStan\Model;
+namespace ActiveRecord\PhpStan\Relation;
 
 use PhpParser\Node\Arg;
 use PHPStan\Analyser\Scope;
diff --git a/phpstan.neon.dist b/phpstan.neon.dist
index f67f02c5..c596c8e9 100644
--- a/phpstan.neon.dist
+++ b/phpstan.neon.dist
@@ -15,7 +15,7 @@ services:
         tags:
           - phpstan.broker.dynamicStaticMethodReturnTypeExtension
     -
-        class: ActiveRecord\PhpStan\Model\RelationDynamicMethodReturnTypeReflection
+        class: ActiveRecord\PhpStan\Relation\RelationDynamicMethodReturnTypeReflection
         tags:
           - phpstan.broker.dynamicMethodReturnTypeExtension
     -
diff --git a/test/ActiveRecordPHPStanTest.php b/test/ActiveRecordPHPStanTest.php
index 11583bbb..73464968 100644
--- a/test/ActiveRecordPHPStanTest.php
+++ b/test/ActiveRecordPHPStanTest.php
@@ -37,7 +37,7 @@ public function testPhpstan()
         //                    '--debug',
         //                    '-c',
         //                    './phpstan.neon.dist',
-        //                    'lib',
+        //                    'test/phpstan',
         //                ]
         //            )
         //        );
diff --git a/test/phpstan/ModelFindByDynamicReturn.php b/test/phpstan/ModelFindByDynamicReturn.php
new file mode 100644
index 00000000..96fd0a05
--- /dev/null
+++ b/test/phpstan/ModelFindByDynamicReturn.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * This file is not something we need to execute in tests. It's included
+ * only as a means to test and aid in the development of dynamic PHPStan
+ * extensions. If it doesn't emit any errors when you run 'composer stan',
+ * then everything is working fine.
+ *
+ * see lib/PhpStan/ModelStaticMethodReflection.php
+ */
+
+use test\models\Book;
+
+$book = Book::find_by_name('Walden');
+assert($book instanceof Book);
+
+$book = Book::find_by_name_and_publisher('Walden', 'Random House');
+assert(is_null($book));
diff --git a/test/phpstan/RelationFindByDynamicReturn.php b/test/phpstan/RelationFindByDynamicReturn.php
new file mode 100644
index 00000000..5f2f53a9
--- /dev/null
+++ b/test/phpstan/RelationFindByDynamicReturn.php
@@ -0,0 +1,17 @@
+<?php
+/**
+ * This file is not something we need to execute in tests. It's included
+ * only as a means to test and aid in the development of dynamic PHPStan
+ * extensions. If it doesn't emit any errors when you run 'composer stan',
+ * then everything is working fine.
+ *
+ * see lib/PhpStan/ModelStaticMethodReflection.php
+ */
+
+use test\models\Book;
+
+$book = Book::all()->find_by_name('Walden');
+assert($book instanceof Book);
+
+$book = Book::all()->find_by_name_and_publisher('Walden', 'Random House');
+assert(is_null($book));