Consistency: context instead of ctx
Add magic mail builder V2