Completed with email and date validation