Refactoring. Aggregate senders