Added number and email validation