Switched from abstract class to Mail specific class