Add MagicMailBuilderV2 (work in progress)