Email classes refactored