Added url and email validation