Added mail class