diff --git a/after/queries/ruby/matchup.scm b/after/queries/ruby/matchup.scm
index 7a4a23d..46c976e 100644
--- a/after/queries/ruby/matchup.scm
+++ b/after/queries/ruby/matchup.scm
@@ -1,8 +1,13 @@
 (method
   "def" @open.def
   "end" @close.def) @scope.def
+(singleton_method
+  "def" @open.def
+  "end" @close.def) @scope.def
 (return
   "return" @mid.def.1)
+(yield
+  "yield" @mid.def.2)
 
 (class
   "class" @open.class
@@ -44,3 +49,11 @@
   (ensure
     "ensure" @mid.begin.2)?
   "end" @close.begin) @scope.begin
+
+(module
+  "module" @open.module
+  "end" @close.module) @scope.module
+
+(do_block
+  "do" @open.do
+  "end" @close.do) @scope.do