diff --git a/Documentation/basics/aggregates.md b/Documentation/basics/aggregates.md
index 366051f2b..3808e9898 100644
--- a/Documentation/basics/aggregates.md
+++ b/Documentation/basics/aggregates.md
@@ -7,6 +7,7 @@ title: Aggregates
 Before you can create an aggregate, you need to create its identity. You can create your own implementation by implementing the `IIdentity` interface or you can use the base class `Identity<>` that EventFlow provides, like this:
 
 ```csharp
+[JsonConverter(typeof(SingleValueObjectConverter))]
 public class TestId : Identity<TestId>
 {
   public TestId(string value) : base(value)
@@ -15,7 +16,9 @@ public class TestId : Identity<TestId>
 }
 ```
 
-The `Identity<>` [value object](../additional/value-objects.md) provides generic functionality to create and validate aggregate root IDs. Please read the documentation regarding the bundled `Identity<>` type as it provides several useful features, such as different schemes for ID generation, including one that minimizes MSSQL database fragmentation.
+The `Identity<>` [value object](../additional/value-objects.md) provides generic functionality to create and validate aggregate root IDs. Please read the [documentation](../basics/identity.md) regarding the bundled `Identity<>` type as it provides several useful features, such as different schemes for ID generation, including one that minimizes MSSQL database fragmentation.
+
+The `TestId` class in this example uses a custom JSON converter called `SingleValueObjectConverter`, which is based on the `JsonConverter` class from `Newtonsoft.Json` library. Using this converter is optional but recommended. It makes JSON serialization of value objects [look cleaner and more readable](../additional/value-objects.md#making-pretty-and-clean-json).
 
 Next, to create a new aggregate, simply inherit from `AggregateRoot<,>` like this, making sure to pass the aggregate's own type as the first generic argument and the identity as the second:
 
@@ -52,16 +55,21 @@ Please make sure to read the section on [value objects and events](../additional
 In order to emit an event from an aggregate, call the `protected` `Emit(...)` method, which applies the event and adds it to the list of uncommitted events.
 
 ```csharp
-public void Ping(string data)
+public class TestAggregate : AggregateRoot<TestAggregate, TestId>
 {
-  // Fancy domain logic here that validates aggregate state...
+  // Other details are omitted for clarity
 
-  if (string.IsNullOrEmpty(data))
+  public void Ping(string data)
   {
-    throw DomainError.With("Ping data is empty");
-  }
+    // Fancy domain logic here that validates aggregate state...
 
-  Emit(new PingEvent(data));
+    if (string.IsNullOrEmpty(data))
+    {
+      throw DomainError.With("Ping data is empty");
+    }
+
+    Emit(new PingEvent(data));
+  }
 }
 ```
 
@@ -72,6 +80,105 @@ Remember not to make any changes to the aggregate with these methods, as the sta
 Currently, EventFlow has four methods of applying events to the aggregate when emitted or loaded from the event store. Which you choose is up to you. Implementing `IEmit<SomeEvent>` is the most convenient, but will expose public `Apply` methods.
 
 - Create a method called `Apply` that takes the event as an argument. To get the method signature right, implement the `IEmit<SomeEvent>` on your aggregate. This is the default fallback, and you will get an exception if no other strategies are configured. Although you *can* implement `IEmit<SomeEvent>`, it's optional. The `Apply` methods can be `protected` or `private`.
+
+  ```csharp
+  public class TestAggregate :
+    AggregateRoot<TestAggregate, TestId>,
+    IEmit<PingEvent>
+  {
+    // Other details are omitted for clarity
+
+    public void Apply(PingEvent aggregateEvent)
+    {
+      // Change the aggregate here
+    }
+  }
+  ```
+
 - Create a state object by inheriting from `AggregateState<,,>` and registering it using the protected `Register(...)` in the aggregate root constructor.
 - Register a specific handler for an event using the protected `Register<SomeEvent>(e => Handler(e))` from within the constructor.
 - Register an event applier using `Register(IEventApplier eventApplier)`, which could be, for example, a state object.
+
+## Modifying the Aggregate
+
+EventFlow provides several ways to change the state of an aggregate.
+
+### Using `IAggregateStore` interface
+
+The `IAggregateStore.UpdateAsync` method allows to load, modify and save the aggregate in a single method call. Here's an example of a controller that modifies `TestAggregate`:
+
+```csharp 
+public class TestController(IAggregateStore aggregateStore) : ControllerBase
+{
+  public async Task Ping(Guid id)
+  {    
+    var testId = TestId.With(id);
+    var sourceId = TestId.New;
+
+    await aggregateStore.UpdateAsync<TestAggregate, TestId>(
+        testId,
+        sourceId,
+        (aggregate, cancellationToken) =>
+        {
+          aggregate.Ping("ping");
+          return Task.CompletedTask;
+        },
+        CancellationToken.None);
+  }
+}
+```
+
+In this example `sourceId` is a unique random identifier that prevents the same operation from being applied twice. To use an aggregate identity as the source ID, it must implement the `ISourceId` interface:
+
+```csharp
+public class TestId : Identity<TestId>, ISourceId 
+{
+  // Other details are omitted for clarity
+}
+```
+
+It is also possible to load, modify and save the aggregate manually using `LoadAsync` and `StoreAsync` methods.
+
+```csharp
+// Load the aggregate from the store
+var testId = TestId.With(id);
+var aggregate = await aggregateStore.LoadAsync<TestAggregate, TestId>(
+  testId,
+  CancellationToken.None);
+
+// Call the method to change the aggregate state
+aggregate.Ping("ping");
+
+// Save the changes
+var sourceId = TestId.New;
+await aggregateStore.StoreAsync<TestAggregate, TestId>(
+  aggregate,
+  sourceId,
+  CancellationToken.None);
+```
+
+### Using the CQRS approach.
+
+Another way to change the aggregate is by following the CQRS (Command Query Responsibility Segregation) pattern.
+
+```csharp
+public class TestController(ICommandBus commandBus) : ControllerBase
+{
+  public async Task Ping(Guid id)
+  {
+    var testId = TestId.With(id);
+
+    // Create a command with the required data
+    var command = new PingCommand(testId)
+    {
+      Data = "ping",
+    };
+
+    // Publish the command using the command bus
+    await commandBus.PublishAsync(command, CancellationToken.None);
+  }
+}
+```
+
+For more details on commands and command handlers, check the [documentation](../basics/commands.md).
+