Replace Requester by Collector
Add Swiftmailer collector
Refactor contexts and traits