Removed Email validation, added Date validation