Fix import
Make AggregateBuilder optional
Fix redis documentation