Changes to have multiple mail configs