updated Mail Service generation