diff --git a/.intellijPlatform/coroutines-javaagent-legacy.jar b/.intellijPlatform/coroutines-javaagent-legacy.jar
index 8fa78e2..8a73742 100644
Binary files a/.intellijPlatform/coroutines-javaagent-legacy.jar and b/.intellijPlatform/coroutines-javaagent-legacy.jar differ
diff --git a/.intellijPlatform/self-update.lock b/.intellijPlatform/self-update.lock
index 667c5a6..3659e5d 100644
--- a/.intellijPlatform/self-update.lock
+++ b/.intellijPlatform/self-update.lock
@@ -1 +1 @@
-2026-03-02
\ No newline at end of file
+2026-04-03
\ No newline at end of file
diff --git a/build.gradle.kts b/build.gradle.kts
index 0852e89..399d521 100644
--- a/build.gradle.kts
+++ b/build.gradle.kts
@@ -5,7 +5,7 @@ plugins {
 }
 
 group = "com.sdk.generators.actionmodels.v3"
-version = "2.1.1"
+version = "2.1.2"
 
 repositories {
   mavenCentral()
@@ -37,6 +37,12 @@ intellijPlatform {
     }
 
     changeNotes = """
+        <h2>[2.1.2]</h2>
+        <ul>
+          <li>Feature: Grouped database actions into a single "Generate Action Models" popup menu.</li>
+          <li>UI: Renamed base action to "Generate Action Models V2" to distinguish it from V3.</li>
+          <li>UI: Improved context menu organization by placing grouped actions at the top of the Database View menu.</li>
+        </ul>
         <h2>[2.1.1]</h2>
         <ul>
           <li>Update: Case-insensitive column type mapping in GUtils.java.</li>
diff --git a/src/main/resources/META-INF/plugin.xml b/src/main/resources/META-INF/plugin.xml
index a12fc35..aaa219e 100644
--- a/src/main/resources/META-INF/plugin.xml
+++ b/src/main/resources/META-INF/plugin.xml
@@ -10,7 +10,13 @@
         Right-click on a package and select "Generate Database Action Models" to start.
     ]]></description>
 
-<change-notes><![CDATA[
+    <change-notes><![CDATA[
+      <h2>[2.1.2]</h2>
+        <ul>
+          <li>Feature: Grouped database actions into a single "Generate Action Models" popup menu.</li>
+          <li>UI: Renamed base action to "Generate Action Models V2" to distinguish it from V3.</li>
+          <li>UI: Improved context menu organization by placing grouped actions at the top of the Database View menu.</li>
+        </ul>
       <h2>[2.1.1]</h2>
         <ul>
           <li>Update: Case-insensitive column type mapping in GUtils.java.</li>
@@ -55,29 +61,24 @@
     <depends>com.intellij.database</depends>
 
     <actions>
-        <!-- Defines an action that will appear in the context menu for project directories -->
-        <action id="com.sdk.generators.actionmodels.GenerateBeanAction"
-                class="com.sdk.generators.actionmodels.GenerateBeanAction"
-                text="Generate Action Models"
-                description="Generates ActionBean classes from a database schema.">
+        <group id="com.sdk.dblogergen.actions.AuditGroup" popup="true" text="Generate Action Models">
             <add-to-group group-id="DatabaseViewPopupMenu" anchor="first"/>
-            <keyboard-shortcut keymap="$default" first-keystroke="ctrl alt G"/>
-        </action>
-        <!-- Defines an action that will appear in the context menu for project directories -->
-        <action id="com.sdk.generators.actionmodels.GenerateBeanAction.v3"
-                class="com.sdk.generators.actionmodels.GenerateBeanActionV3"
-                text="Generate Action Models V3"
-                description="Generates ActionBean classes from a database schema V3 (sdk.db.xxx).">
-            <add-to-group group-id="DatabaseViewPopupMenu" anchor="after" relative-to-action="com.sdk.generators.actionmodels.GenerateBeanAction"/>
-            <keyboard-shortcut keymap="$default" first-keystroke="ctrl alt H"/>
-        </action>
-        <action id="com.sdk.generators.actionmodels.GenerateDatasetAction"
-                class="com.sdk.generators.actionmodels.GenerateDatasetAction"
-                text="Generate Dataset XML"
-                description="Generates Dataset XML definition from a database table.">
-            <add-to-group group-id="DatabaseViewPopupMenu" anchor="after" relative-to-action="com.sdk.generators.actionmodels.GenerateBeanAction.v3"/>
-            <keyboard-shortcut keymap="$default" first-keystroke="ctrl alt J"/>
-        </action>
+            <action id="com.sdk.generators.actionmodels.GenerateBeanAction"
+                    class="com.sdk.generators.actionmodels.GenerateBeanAction"
+                    text="Generate Action Models V2"
+                    description="Generates ActionBean classes from a database schema.">
+            </action>
+            <action id="com.sdk.generators.actionmodels.GenerateBeanAction.v3"
+                    class="com.sdk.generators.actionmodels.GenerateBeanActionV3"
+                    text="Generate Action Models V3"
+                    description="Generates ActionBean classes from a database schema V3 (sdk.db.xxx).">
+            </action>
+            <action id="com.sdk.generators.actionmodels.GenerateDatasetAction"
+                    class="com.sdk.generators.actionmodels.GenerateDatasetAction"
+                    text="Generate Dataset XML"
+                    description="Generates Dataset XML definition from a database table.">
+            </action>
+        </group>
     </actions>
 
     <!-- in plugin.xml, inside the <extensions defaultExtensionNs="com.intellij"> tag -->