Added Email and Number to Entry Types