diff --git a/core/src/main/scala/chisel3/Aggregate.scala b/core/src/main/scala/chisel3/Aggregate.scala
index 4cf427fffda..3fe242615ad 100644
--- a/core/src/main/scala/chisel3/Aggregate.scala
+++ b/core/src/main/scala/chisel3/Aggregate.scala
@@ -20,6 +20,7 @@ class AliasedAggregateFieldException(message: String) extends ChiselException(me
 
 /** An abstract class for data types that solely consist of (are an aggregate
   * of) other Data objects.
+  * @groupdesc Other methods inherited from Data
   */
 sealed abstract class Aggregate extends Data {
   private[chisel3] override def bind(target: Binding, parentDirection: SpecifiedDirection): Unit = {
@@ -74,6 +75,7 @@ sealed abstract class Aggregate extends Data {
   }
 
   /** Returns a Seq of the immediate contents of this Aggregate, in order.
+  @Contents
     */
   def getElements: Seq[Data]
 
@@ -1031,6 +1033,7 @@ package experimental {
   *      io.outPacket <> reg
   *   }
   * }}}
+  * @group Bundle
   */
 abstract class Bundle(implicit compileOptions: CompileOptions) extends Record {
   override def className: String = this.getClass.getSimpleName match {