diff --git a/website/docs/api/soql.md b/website/docs/api/soql.md
index f3fd609e..b0cc4a81 100644
--- a/website/docs/api/soql.md
+++ b/website/docs/api/soql.md
@@ -1524,7 +1524,7 @@ Map<String, List<SObject>> toAggregatedMap(SObjectField keyField)
 **Example**
 
 ```apex
-Map<String, Account> industryToAccounts = SOQL.of(Account.SObjectType).toAggregatedMap(Account.Industry);
+Map<String, List<Account>> industryToAccounts = (Map<String, List<Account>>) SOQL.of(Account.SObjectType).toAggregatedMap(Account.Industry);
 ```
 
 ### toAggregatedMap with custom value
diff --git a/website/docs/examples/result.md b/website/docs/examples/result.md
index 86cbe0b1..b3dbdc9c 100644
--- a/website/docs/examples/result.md
+++ b/website/docs/examples/result.md
@@ -44,8 +44,24 @@ public with sharing class MyController {
         return SOQL_Account.query().count().toInteger();
     }
 
-    public static Map<Id, SObject> getAccountMap() {
-        return SOQL_Account.query().toMap();
+    public static Map<Id, Account> getAccountMap() {
+        return (Map<Id, Account>) SOQL_Account.query().toMap();
+    }
+
+    public static Map<String, Account> getAccountsPerName() {
+        return (Map<String, Account>) SOQL_Account.query().toMap(Account.Name);
+    }
+
+    public static Map<String, String> getAccountIndustryPerAccountId() {
+        return SOQL_Account.query().toMap(Account.Id, Account.Industry);
+    }
+
+    public static Map<String, List<Account>> getAccountsPerIndustry() {
+        return (Map<String, List<Account>>) SOQL_Account.query().toAggregatedMap(Account.Industry);
+    }
+
+    public static Map<String, List<String>> getAccountNamesPerIndustry() {
+        return SOQL_Account.query().toAggregatedMap(Account.Industry, Account.Name);
     }
 
     public static Database.QueryLocator getAccountQueryLocator() {