Map through CommandContext
Removed unused aggregate builder