Updated packages and added checks for email sender