Added new email and date features