Scala aggregator with timeout handling
Unify endpoint name