Refactor Command::Aggregate