Refactored Email Package