diff --git a/framework/.meta-storm/db.meta-storm.xml b/framework/.meta-storm/db.meta-storm.xml
index 915d99ada1..3dcb647146 100644
--- a/framework/.meta-storm/db.meta-storm.xml
+++ b/framework/.meta-storm/db.meta-storm.xml
@@ -1,50 +1,53 @@
 <?xml version="1.0"?>
 <meta-storm xmlns="meta-storm">
     <definitions>
-        <classMethod class="\yii\db\Query" method="where" argument="0" targetValue="false" targetInArray="key">
-            <properties xpath="$variable"/>
+        <classMethod class="\yii\db\QueryInterface" method="where" argument="0" targetValue="false" targetInArray="key">
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
-        <classMethod class="\yii\db\Query" method="andWhere" argument="0" targetValue="false" targetInArray="key">
-            <properties xpath="$variable"/>
+        <classMethod class="\yii\db\QueryInterface" method="andWhere" argument="0" targetValue="false" targetInArray="key">
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
-        <classMethod class="\yii\db\Query" method="orWhere" argument="0" targetValue="false" targetInArray="key">
-            <properties xpath="$variable"/>
+        <classMethod class="\yii\db\QueryInterface" method="orWhere" argument="0" targetValue="false" targetInArray="key">
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
-        <classMethod class="\yii\db\Query" method="filterWhere" argument="0" targetValue="false" targetInArray="key">
-            <properties xpath="$variable"/>
+        <classMethod class="\yii\db\QueryInterface" method="filterWhere" argument="0" targetValue="false" targetInArray="key">
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
-        <classMethod class="\yii\db\Query" method="andFilterWhere" argument="0" targetValue="false" targetInArray="key">
-            <properties xpath="$variable"/>
+        <classMethod class="\yii\db\QueryInterface" method="andFilterWhere" argument="0" targetValue="false" targetInArray="key">
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
-        <classMethod class="\yii\db\Query" method="orFilterWhere" argument="0" targetValue="false" targetInArray="key">
-            <properties xpath="$variable"/>
+        <classMethod class="\yii\db\QueryInterface" method="orFilterWhere" argument="0" targetValue="false" targetInArray="key">
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
         <classMethod class="\yii\db\Query" method="filterHaving" argument="0" targetValue="false" targetInArray="key">
-            <properties xpath="$variable"/>
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
         <classMethod class="\yii\db\Query" method="andFilterHaving" argument="0" targetValue="false" targetInArray="key">
-            <properties xpath="$variable"/>
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
         <classMethod class="\yii\db\Query" method="orFilterHaving" argument="0" targetValue="false" targetInArray="key">
-            <properties xpath="$variable"/>
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
         <classMethod class="\yii\db\Query" method="select" argument="0" targetInArray="value">
-            <properties xpath="$variable"/>
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
         <classMethod class="\yii\db\Query" method="addSelect" argument="0" targetInArray="value">
-            <properties xpath="$variable"/>
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
         <classMethod class="\yii\db\Query" method="groupBy" argument="0" targetInArray="key">
-            <properties xpath="$variable"/>
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
         <classMethod class="\yii\db\Query" method="addGroupBy" argument="0" targetInArray="key">
-            <properties xpath="$variable"/>
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
-        <classMethod class="\yii\db\Query" method="orderBy" argument="0" targetInArray="key">
-            <properties xpath="$variable"/>
+        <classMethod class="\yii\db\QueryInterface" method="orderBy" argument="0" targetInArray="key">
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
-        <classMethod class="\yii\db\Query" method="addOrderBy" argument="0" targetInArray="key">
-            <properties xpath="$variable"/>
+        <classMethod class="\yii\db\QueryInterface" method="addOrderBy" argument="0" targetInArray="key">
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
+        </classMethod>
+        <classMethod class="\yii\db\QueryInterface" method="indexBy" argument="0" targetInArray="key">
+            <properties xpath="$variable" protected="false" static="false" private="false"/>
         </classMethod>
     </definitions>
 </meta-storm>
diff --git a/framework/.meta-storm/widgets.meta-storm.xml b/framework/.meta-storm/widgets.meta-storm.xml
index d08dd02848..83b37b4b40 100644
--- a/framework/.meta-storm/widgets.meta-storm.xml
+++ b/framework/.meta-storm/widgets.meta-storm.xml
@@ -4,6 +4,9 @@
         <classMethod class="\yii\base\Widget" method="widget" argument="0" targetValue="false" targetInArray="key">
             <properties protected="false" private="false" xpath="$variable"/>
         </classMethod>
+        <classMethod class="\yii\base\Widget" method="begin" argument="0" targetValue="false" targetInArray="key">
+            <properties protected="false" private="false" xpath="$variable"/>
+        </classMethod>
 
         <classMethod class="\yii\widgets\ActiveForm" method="field" argument="1">
             <properties protected="false" private="false" relatedArgument="0" relatedTo="argument"/>